From dacbfc4ae96fca71935e3f987dc3530f615a665f Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 11 May 2021 10:56:10 -0700
Subject: [PATCH] Tools: Try to exit more gracefully from fuzzing.

If we catch a signal while we're fuzzing, exit with a successful status
and clean up after ourselves.
---
 tools/fuzz-test.sh    | 5 +++--
 tools/randpkt-test.sh | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/fuzz-test.sh b/tools/fuzz-test.sh
index 615dd73274..3a4fd3ddab 100755
--- a/tools/fuzz-test.sh
+++ b/tools/fuzz-test.sh
@@ -150,8 +150,9 @@ echo ""
 
 # Clean up on <ctrl>C, etc
 trap_all() {
-    DONE=true
-    echo 'Caught signal'
+    printf '\n\nCaught signal. Exiting.\n'
+    rm -f "$TMP_DIR/$TMP_FILE" "$TMP_DIR/$ERR_FILE"*
+    exit 0
 }
 
 trap_abrt() {
diff --git a/tools/randpkt-test.sh b/tools/randpkt-test.sh
index 955ca774c8..b47646ddd9 100755
--- a/tools/randpkt-test.sh
+++ b/tools/randpkt-test.sh
@@ -83,8 +83,14 @@ echo "($HOWMANY)"
 echo "Running $RANDPKT with args: $RANDPKT_ARGS"
 echo ""
 
-trap "MAX_PASSES=1; echo 'Caught signal'" HUP INT TERM
+# Clean up on <ctrl>C, etc
+trap_all() {
+    printf '\n\nCaught signal. Exiting.\n'
+    rm -f "$TMP_DIR/$TMP_FILE" "$TMP_DIR/$ERR_FILE"
+    exit 0
+}
 
+trap trap_all HUP INT TERM ABRT
 
 # Iterate over our capture files.
 PASS=0