diff options
author | Andrea Mattavelli <andreamattavelli@users.noreply.github.com> | 2017-03-03 12:16:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-03 12:16:12 +0000 |
commit | 4b199e1726ac45227f62ae0365063236a9a10033 (patch) | |
tree | 78752c1ad67fe1c043d9f7e0dde9c5eb203b3c52 /lib | |
parent | 81faeb3e9697166316594240c9b31a141127d938 (diff) | |
parent | 923cf308465799038ce54da949a84906c45e8951 (diff) | |
download | klee-4b199e1726ac45227f62ae0365063236a9a10033.tar.gz |
Merge pull request #589 from gladtbx/klee_fix_pathOS
Fix internal fork without new pathOS.id
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Core/Executor.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index c5d294fb..f5b46fc0 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -976,14 +976,18 @@ Executor::fork(ExecutionState ¤t, ref<Expr> condition, bool isInternal) { falseState->ptreeNode = res.first; trueState->ptreeNode = res.second; - if (!isInternal) { - if (pathWriter) { - falseState->pathOS = pathWriter->open(current.pathOS); + if (pathWriter) { + // Need to update the pathOS.id field of falseState, otherwise the same id + // is used for both falseState and trueState. + falseState->pathOS = pathWriter->open(current.pathOS); + if (!isInternal) { trueState->pathOS << "1"; falseState->pathOS << "0"; - } - if (symPathWriter) { - falseState->symPathOS = symPathWriter->open(current.symPathOS); + } + } + if (symPathWriter) { + falseState->symPathOS = symPathWriter->open(current.symPathOS); + if (!isInternal) { trueState->symPathOS << "1"; falseState->symPathOS << "0"; } |