Changeset 0b8cd722

Timestamp:

Jan 8, 2015, 2:37:47 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

6c3744e

Parents:

17cd4eb

Message:

fix uninitialized value, fix memory reads after frees

Location:

translator

Files:

• Parser/InitializerNode.cc (modified) (1 diff)
• Parser/TypeData.cc (modified) (1 diff)
• Parser/TypedefTable.cc (modified) (1 diff)
• examples/swap.c (modified) (2 diffs)

translator/Parser/InitializerNode.cc

@@ -20 +20 @@
 
 InitializerNode::InitializerNode( InitializerNode *init, bool aggrp, ExpressionNode *des )
-        : aggregate( aggrp ), designator( des ), kids( 0 ) {
+    : expr( 0 ), aggregate( aggrp ), designator( des ), kids( 0 ) {
     if ( init != 0 )
         set_link(init);

translator/Parser/TypeData.cc

@@ -33 +33 @@
         function->body = 0;
         function->hasBody = false;
+        function->newStyle = false;
         break;
       case Aggregate:

translator/Parser/TypedefTable.cc

@@ -106 +106 @@
 void TypedefTable::leaveScope(void) {
     debugPrint( "Leaving scope " << currentScope << endl );
-    for (tableType::iterator i = table.begin(); i != table.end(); i++) {
+    for (tableType::iterator i = table.begin(); i != table.end(); ) {
         list<Entry> &declList = (*i).second;
         while (!declList.empty() && declList.front().scope == currentScope) {
             declList.pop_front();
         }
-        if ( declList.empty() ) {
-            table.erase( i );
-        }
+        if ( declList.empty() ) {                       // standard idom for erasing during traversal
+            table.erase( i++ );
+        } else ++i;
     }
     currentScope -= 1;

translator/examples/swap.c

@@ -4 +4 @@
 
 forall( type T )
-T swap( T *left, T *right ) {
+void swap( T *left, T *right ) {
     T temp;
     temp = *left;
     *left = *right;
     *right = temp;
-    return *right;
 }
 
@@ -15 +14 @@
     int x = 1, y = 2;
     printf( "%d %d\n", x, y );
-    int w;
-    w = swap( &x, &y );
-    printf( "%d %d %d\n", w, x, y );
+    swap( &x, &y );
+    printf( "%d %d\n", x, y );
 }