diff options
| author | van Hauser <vh@thc.org> | 2020-07-01 16:52:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 16:52:05 +0200 |
| commit | 4a51cb71fb8785325dedac693cdea4648f6e5279 (patch) | |
| tree | 739cac84ac9173491542d407004c894e2f8bd7fa | |
| parent | e15a0136966f45807c03d4272d2c3d3238b0d997 (diff) | |
| parent | f2efea4b46584b134bf9016f24548d07934b6632 (diff) | |
| download | afl++-4a51cb71fb8785325dedac693cdea4648f6e5279.tar.gz | |
Merge pull request #434 from AFLplusplus/dev 2.66c
Last Minute Unicornafl Update
| -rw-r--r-- | unicorn_mode/UNICORNAFL_VERSION | 2 | ||||
| -rw-r--r-- | unicorn_mode/samples/persistent/harness.c | 2 | ||||
| m--------- | unicorn_mode/unicornafl | 0 | ||||
| -rwxr-xr-x | unicorn_mode/update_uc_ref.sh | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/unicorn_mode/UNICORNAFL_VERSION b/unicorn_mode/UNICORNAFL_VERSION index 21a8657d..02736b77 100644 --- a/unicorn_mode/UNICORNAFL_VERSION +++ b/unicorn_mode/UNICORNAFL_VERSION @@ -1 +1 @@ -0ca7a8f2 +c6d66471 diff --git a/unicorn_mode/samples/persistent/harness.c b/unicorn_mode/samples/persistent/harness.c index 30013b4c..eae3f1fc 100644 --- a/unicorn_mode/samples/persistent/harness.c +++ b/unicorn_mode/samples/persistent/harness.c @@ -204,7 +204,7 @@ int main(int argc, char **argv, char **envp) { // Map memory. mem_map_checked(uc, BASE_ADDRESS, len, UC_PROT_ALL); - printf("Len: %lx\n", len); + /* printf("Len: %lx\n", len); */ fflush(stdout); // write machine code to be emulated to memory diff --git a/unicorn_mode/unicornafl b/unicorn_mode/unicornafl -Subproject 0ca7a8f22b8bb028eb9fe053c0974a60ee640f1 +Subproject c6d6647161a32bae88785a618fcd828d1711d9e diff --git a/unicorn_mode/update_uc_ref.sh b/unicorn_mode/update_uc_ref.sh index 21450e69..a2613942 100755 --- a/unicorn_mode/update_uc_ref.sh +++ b/unicorn_mode/update_uc_ref.sh @@ -21,10 +21,10 @@ fi git submodule init && git submodule update || exit 1 cd ./unicornafl || exit 1 -git fetch origin master 1>/dev/null || exit 1 +git fetch origin dev 1>/dev/null || exit 1 git stash 1>/dev/null 2>/dev/null git stash drop 1>/dev/null 2>/dev/null -git checkout master +git checkout dev if [ -z "$NEW_VERSION" ]; then # No version provided, take HEAD. |