Check for NULL datavals to avoid crashes.

svn path=/trunk/yasm/; revision=250

diff --git a/modules/parsers/nasm/bison.y.in b/modules/parsers/nasm/bison.y.in
index 5aa68e6fafe837920870de7f6c13a11851d1fd02..9b633fbd622dc3ea355b9c97cf5e4aa80b182a19 100644 (file)
--- a/modules/parsers/nasm/bison.y.in
+++ b/modules/parsers/nasm/bison.y.in
@@ -155,10 +155,12 @@ exp: instr
 
 datavals: dataval          {
        STAILQ_INIT(&$$);
-       STAILQ_INSERT_TAIL(&$$, $1, link);
+       if ($1)
+           STAILQ_INSERT_TAIL(&$$, $1, link);
     }
     | datavals ',' dataval  {
-       STAILQ_INSERT_TAIL(&$1, $3, link);
+       if ($3)
+           STAILQ_INSERT_TAIL(&$1, $3, link);
        $$ = $1;
     }
 ;

diff --git a/modules/parsers/nasm/nasm-bison.y b/modules/parsers/nasm/nasm-bison.y
index 5aa68e6fafe837920870de7f6c13a11851d1fd02..9b633fbd622dc3ea355b9c97cf5e4aa80b182a19 100644 (file)
--- a/modules/parsers/nasm/nasm-bison.y
+++ b/modules/parsers/nasm/nasm-bison.y
@@ -155,10 +155,12 @@ exp: instr
 
 datavals: dataval          {
        STAILQ_INIT(&$$);
-       STAILQ_INSERT_TAIL(&$$, $1, link);
+       if ($1)
+           STAILQ_INSERT_TAIL(&$$, $1, link);
     }
     | datavals ',' dataval  {
-       STAILQ_INSERT_TAIL(&$1, $3, link);
+       if ($3)
+           STAILQ_INSERT_TAIL(&$1, $3, link);
        $$ = $1;
     }
 ;

diff --git a/src/parsers/nasm/bison.y.in b/src/parsers/nasm/bison.y.in
index 5aa68e6fafe837920870de7f6c13a11851d1fd02..9b633fbd622dc3ea355b9c97cf5e4aa80b182a19 100644 (file)
--- a/src/parsers/nasm/bison.y.in
+++ b/src/parsers/nasm/bison.y.in
@@ -155,10 +155,12 @@ exp: instr
 
 datavals: dataval          {
        STAILQ_INIT(&$$);
-       STAILQ_INSERT_TAIL(&$$, $1, link);
+       if ($1)
+           STAILQ_INSERT_TAIL(&$$, $1, link);
     }
     | datavals ',' dataval  {
-       STAILQ_INSERT_TAIL(&$1, $3, link);
+       if ($3)
+           STAILQ_INSERT_TAIL(&$1, $3, link);
        $$ = $1;
     }
 ;

diff --git a/src/parsers/nasm/nasm-bison.y b/src/parsers/nasm/nasm-bison.y
index 5aa68e6fafe837920870de7f6c13a11851d1fd02..9b633fbd622dc3ea355b9c97cf5e4aa80b182a19 100644 (file)
--- a/src/parsers/nasm/nasm-bison.y
+++ b/src/parsers/nasm/nasm-bison.y
@@ -155,10 +155,12 @@ exp: instr
 
 datavals: dataval          {
        STAILQ_INIT(&$$);
-       STAILQ_INSERT_TAIL(&$$, $1, link);
+       if ($1)
+           STAILQ_INSERT_TAIL(&$$, $1, link);
     }
     | datavals ',' dataval  {
-       STAILQ_INSERT_TAIL(&$1, $3, link);
+       if ($3)
+           STAILQ_INSERT_TAIL(&$1, $3, link);
        $$ = $1;
     }
 ;