From 8d9378dce6ba7dc10d5d331eade862ca34a91cdb Mon Sep 17 00:00:00 2001
From: pyknite <julien.rinaldini@heig-vd.ch>
Date: Thu, 2 Jan 2014 12:46:00 +0100
Subject: [PATCH] fix issue #1

---
 lib/Transforms/Obfuscation/Substitution.cpp | 44 +++++++--------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/lib/Transforms/Obfuscation/Substitution.cpp b/lib/Transforms/Obfuscation/Substitution.cpp
index 24ede89fc..068ae56ad 100644
--- a/lib/Transforms/Obfuscation/Substitution.cpp
+++ b/lib/Transforms/Obfuscation/Substitution.cpp
@@ -13,9 +13,10 @@
 
 #include "llvm/Transforms/Obfuscation/Substitution.h"
 #include "llvm/LLVMContext.h"
+#include "llvm/Support/raw_ostream.h"
 
 #define DEBUG_TYPE "substitution"
- 
+
 #define NUMBER_ADD_SUBST   4
 #define NUMBER_SUB_SUBST   3
 #define NUMBER_AND_SUBST   2
@@ -43,7 +44,7 @@ STATISTIC(Or,   "Or substitued");
 STATISTIC(Xor,  "Xor substitued");
 
 namespace {
-    
+
     struct Substitution : public FunctionPass {
         static char ID; // Pass identification, replacement for typeid
         void (*funcAdd[NUMBER_ADD_SUBST])(BinaryOperator *bo);
@@ -51,51 +52,50 @@ namespace {
         void (*funcAnd[NUMBER_AND_SUBST])(BinaryOperator *bo);
         void (*funcOr[NUMBER_OR_SUBST])(BinaryOperator *bo);
         void (*funcXor[NUMBER_XOR_SUBST])(BinaryOperator *bo);
-        
+
         Substitution() : FunctionPass(ID) {
-            
+
             funcAdd[0] = addNeg;
             funcAdd[1] = addDoubleNeg;
             funcAdd[2] = addRand;
             funcAdd[3] = addRand2;
-            
+
             funcSub[0] = subNeg;
             funcSub[1] = subRand;
             funcSub[2] = subRand2;
-            
+
             funcAnd[0] = andSubstitution;
             funcAnd[1] = andSubstitutionRand;
-            
+
             funcOr[0] = orSubstitution;
             funcOr[1] = orSubstitutionRand;
-            
+
             funcXor[0] = xorSubstitution;
             funcXor[1] = xorSubstitutionRand;
         }
-        
+
         virtual bool runOnFunction(Function &F) {
             Function *tmp = &F;
             string func = FunctionName;
-            vector<Instruction*> toDel;
-            
+
             // Check if declaration or variadic
             if(tmp->isDeclaration()) {
                 return false;
             }
-            
+
             // Check if the percentage is correct
             if ( !((Percentage > 0) && (Percentage <= 100)) ) {
                 LLVMContext &ctx = llvm::getGlobalContext();
                 ctx.emitError(Twine ("Substitution percentage -perSUB=x must be 0 < x <= 100"));
             }
-            
+
             // Check if the percentage is correct
             if (ObfTimes <= 0) {
                 LLVMContext &ctx = llvm::getGlobalContext();
                 ctx.emitError(Twine ("Substitution application number -sub-loop=x must be x > 0"));
             }
 
-            
+
             if( (func.size() != 0 && func.find(tmp->getName()) != string::npos) ||
                ((int) llvm::cprng->get_range(100) < Percentage) ) {
                 // Loop for the number of time we run the pass on the function
@@ -110,58 +110,47 @@ namespace {
                                         //case BinaryOperator::FAdd:
                                         // Substitute with random add operation
                                         funcAdd[llvm::cprng->get_range(NUMBER_ADD_SUBST)](cast<BinaryOperator>(inst));
-                                        toDel.push_back(inst);
                                         ++Add;
                                         break;
                                     case BinaryOperator::Sub:
                                         //case BinaryOperator::FSub:
                                         // Substitute with random sub operation
                                         funcSub[llvm::cprng->get_range(NUMBER_SUB_SUBST)](cast<BinaryOperator>(inst));
-                                        toDel.push_back(inst);
                                         ++Sub;
                                         break;
                                     case BinaryOperator::Mul:
                                     case BinaryOperator::FMul:
-                                        //toDel.push_back(inst);
                                         //++Mul;
                                         break;
                                     case BinaryOperator::UDiv:
                                     case BinaryOperator::SDiv:
                                     case BinaryOperator::FDiv:
-                                        //toDel.push_back(inst);
                                         //++Div;
                                         break;
                                     case BinaryOperator::URem:
                                     case BinaryOperator::SRem:
                                     case BinaryOperator::FRem:
-                                        //toDel.push_back(inst);
                                         //++Rem;
                                         break;
                                     case Instruction::Shl:
-                                        //toDel.push_back(inst);
                                         //++Shi;
                                     break;
                                     case Instruction::LShr:
-                                        //toDel.push_back(inst);
                                         //++Shi;
                                         break;
                                     case Instruction::AShr:
-                                        //toDel.push_back(inst);
                                         //++Shi;
                                         break;
                                     case Instruction::And:
                                         funcAnd[llvm::cprng->get_range(2)](cast<BinaryOperator>(inst));
-                                        toDel.push_back(inst);
                                         ++And;
                                         break;
                                     case Instruction::Or:
                                         funcOr[llvm::cprng->get_range(2)](cast<BinaryOperator>(inst));
-                                        toDel.push_back(inst);
                                         ++Or;
                                         break;
                                     case Instruction::Xor:
                                         funcXor[llvm::cprng->get_range(2)](cast<BinaryOperator>(inst));
-                                        toDel.push_back(inst);
                                         ++Xor;
                                         break;
                                     default:
@@ -172,10 +161,7 @@ namespace {
                     } // End for Function
                 } while (--times > 0); // for times
             } // End if func name && percentage
-            
-            // Delete obfuscated instruction
-            for(vector<Instruction*>::iterator i=toDel.begin();i!=toDel.end();++i)
-                (*i)->eraseFromParent();
+
             return false;
         }
     };