[llvm-commits] [llvm] r126381 - in /llvm/trunk: lib/MC/MCDisassembler/EDToken.cpp tools/llvm-mc/Disassembler.cpp

[Benjamin Kramer]

Author: d0k
Date: Thu Feb 24 05:03:19 2011
New Revision: 126381

URL: http://llvm.org/viewvc/llvm-project?rev=126381&view=rev
Log:
Plug some leaks in edis.

- Don't leak parsed operands during tokenization.
- Don't leak printed insts in llvm-mc.

Modified:
    llvm/trunk/lib/MC/MCDisassembler/EDToken.cpp
    llvm/trunk/tools/llvm-mc/Disassembler.cpp

Modified: llvm/trunk/lib/MC/MCDisassembler/EDToken.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCDisassembler/EDToken.cpp?rev=126381&r1=126380&r2=126381&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCDisassembler/EDToken.cpp (original)
+++ llvm/trunk/lib/MC/MCDisassembler/EDToken.cpp Thu Feb 24 05:03:19 2011
@@ -194,6 +194,10 @@
     tokens.push_back(token);
   }
   
+  // Free any parsed operands.
+  for (unsigned i = 0, e = parsedOperands.size(); i != e; ++i)
+    delete parsedOperands[i];
+
   return 0;
 }
 

Modified: llvm/trunk/tools/llvm-mc/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mc/Disassembler.cpp?rev=126381&r1=126380&r2=126381&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-mc/Disassembler.cpp (original)
+++ llvm/trunk/tools/llvm-mc/Disassembler.cpp Thu Feb 24 05:03:19 2011
@@ -227,8 +227,8 @@
   }
   
   EDDisassembler::initialize();
-  EDDisassembler *disassembler =
-    EDDisassembler::getDisassembler(TS.c_str(), AS);
+  OwningPtr<EDDisassembler>
+    disassembler(EDDisassembler::getDisassembler(TS.c_str(), AS));
   
   if (disassembler == 0) {
     errs() << "error: couldn't get disassembler for " << TS << '\n';
@@ -236,8 +236,8 @@
   }
   
   while (ByteArray.size()) {
-    EDInst *inst =
-      disassembler->createInst(byteArrayReader, 0, &ByteArray);
+    OwningPtr<EDInst>
+      inst(disassembler->createInst(byteArrayReader, 0, &ByteArray));
   
     ByteArray.erase (ByteArray.begin(), ByteArray.begin() + inst->byteSize());
                                
@@ -330,7 +330,7 @@
       }
       
       uint64_t evaluatedResult;
-      void *Arg[] = { disassembler, &Out };
+      void *Arg[] = { disassembler.get(), &Out };
       if (operand->evaluate(evaluatedResult, verboseEvaluator, Arg)) {
         errs() << "error: Couldn't evaluate an operand\n";
         return -1;