Changeset 0b8cd722 for translator/Parser/TypedefTable.cc

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

File:

• translator/Parser/TypedefTable.cc (modified) (1 diff)

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;