Lil-Ran/Pyarmor-Static-Unpack-1shot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add some extra guards against null dereference and empty std::stack pops

Browse Source 
Fixes segfault cases of #572
This commit is contained in:
Michael Hansen
2025-08-28 15:33:13 -07:00
parent ff0c1450b4
commit 0e7be40367
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ASTree.cpp
View File

@@ -1231,8 +1231,12 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
break; break;
} }
stack = stack_hist.top(); if (!stack_hist.empty()) {
stack_hist.pop(); stack = stack_hist.top();
stack_hist.pop();
} else {
fprintf(stderr, "Warning: Stack history is empty, something wrong might have happened\n");
}
PycRef<ASTBlock> prev = curblock; PycRef<ASTBlock> prev = curblock;
PycRef<ASTBlock> nil; PycRef<ASTBlock> nil;
@@ -1389,10 +1393,10 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
} while (prev != nil); } while (prev != nil);
curblock = blocks.top(); if (!blocks.empty()) {
curblock = blocks.top();
if (curblock->blktype() == ASTBlock::BLK_EXCEPT) { if (curblock->blktype() == ASTBlock::BLK_EXCEPT)
curblock->setEnd(pos+offs); curblock->setEnd(pos+offs);
} }
} }
break; break;
@@ -1769,7 +1773,8 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
else else
curblock->append(new ASTPrint(stack.top(), stream)); curblock->append(new ASTPrint(stack.top(), stream));
stack.pop(); stack.pop();
stream->setProcessed(); if (stream)
stream->setProcessed();
} }
break; break;
case Pyc::PRINT_NEWLINE: case Pyc::PRINT_NEWLINE:
@@ -1797,7 +1802,8 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
else else
curblock->append(new ASTPrint(nullptr, stream)); curblock->append(new ASTPrint(nullptr, stream));
stack.pop(); stack.pop();
stream->setProcessed(); if (stream)
stream->setProcessed();
} }
break; break;
case Pyc::RAISE_VARARGS_A: case Pyc::RAISE_VARARGS_A: