Skip to content

Bug fix #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhaowoxin wants to merge 1 commit into
base: llvm-3.5
Choose a base branch
from
Open

Bug fix #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion lib/Transforms/Obfuscation/Flattening.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ bool Flattening::flatten(Function *f) {
br = cast<BranchInst>(insert->getTerminator());
}

BasicBlock *zeroBB = NULL;
if ((br != NULL && br->isConditional()) ||
insert->getTerminator()->getNumSuccessors() > 1) {
BasicBlock::iterator i = insert->back();
Expand All @@ -117,6 +118,9 @@ bool Flattening::flatten(Function *f) {

BasicBlock *tmpBB = insert->splitBasicBlock(i, "first");
origBB.insert(origBB.begin(), tmpBB);
} else if (br != NULL && insert->getTerminator()->getNumSuccessors() == 1) {
// Record the first BB branch to
zeroBB = insert->getTerminator()->getSuccessor(0);
}

// Remove jump
Expand Down Expand Up @@ -169,7 +173,12 @@ bool Flattening::flatten(Function *f) {
numCase = cast<ConstantInt>(ConstantInt::get(
switchI->getCondition()->getType(),
llvm::cryptoutils->scramble32(switchI->getNumCases(), scrambling_key)));
switchI->addCase(numCase, i);
if (zeroBB && zeroBB != i) {
switchI->addCase(numCase, zeroBB);
zeroBB = NULL;
} else {
switchI->addCase(numCase, i);
}
}

// Recalculate switchVar
Expand Down