Changeset 5210

Timestamp:

Mar 14, 2010 11:20:57 PM (3 years ago)

Author:

oxygene

Message:

Fix segfault of romcc when complex assignment operators
were applied to non-trivial LHSs, eg. c[4] |= 1;

Signed-off-by: Patrick Georgi <patrick.georgi@…>
Acked-by: Stefan Reinauer <stepan@…>

File:

• trunk/util/romcc/romcc.c (modified) (5 diffs)

trunk/util/romcc/romcc.c

@@ -1897 +1897 @@
         if (!user)
                 return;
-        ptr = &used->use;
-        while(*ptr) {
-                if ((*ptr)->member == user) {
-                        return;
-                }
-                ptr = &(*ptr)->next;
+        if (used->use == (void*)-1)
+                used->use = 0;
+        if (used->use) {
+                ptr = &used->use;
+                while(*ptr) {
+                        if ((*ptr)->member == user) {
+                                return;
+                        }
+                        ptr = &(*ptr)->next;
+                }
         }
         /* Append new to the head of the list, 
@@ -11600 +11604 @@
                 def = write_expr(state, left,
                         triple(state, op, left->type, 
-                                read_expr(state, left), right));
+                                read_expr(state, copy_triple(state, left)), right));
                 break;
         case TOK_PLUSEQ:
@@ -11606 +11610 @@
                 eat(state, TOK_PLUSEQ);
                 def = write_expr(state, left,
-                        mk_add_expr(state, left, assignment_expr(state)));
+                        mk_add_expr(state, copy_triple(state, left), assignment_expr(state)));
                 break;
         case TOK_MINUSEQ:
@@ -11612 +11616 @@
                 eat(state, TOK_MINUSEQ);
                 def = write_expr(state, left,
-                        mk_sub_expr(state, left, assignment_expr(state)));
+                        mk_sub_expr(state, copy_triple(state, left), assignment_expr(state)));
                 break;
         case TOK_SLEQ:
@@ -11636 +11640 @@
                 def = write_expr(state, left,
                         triple(state, op, left->type, 
-                                read_expr(state, left), right));
+                                read_expr(state, copy_triple(state,left)), right));
                 break;
         }