From a6099fa65db8097ae4dc12c9d8e359a8465762ce Mon Sep 17 00:00:00 2001
From: Vincent Rabaud <vrabaud@google.com>
Date: Thu, 4 Apr 2024 11:25:59 +0200
Subject: [PATCH] Add timeout.

---
 ext/fuzztest.cmd        | 3 ++-
 tests/oss-fuzz/build.sh | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ext/fuzztest.cmd b/ext/fuzztest.cmd
index 79c0f3dbfc..396a0b934e 100755
--- a/ext/fuzztest.cmd
+++ b/ext/fuzztest.cmd
@@ -10,7 +10,8 @@
 git clone https://github.com/google/fuzztest.git
 cd fuzztest
 : # There is no tagged release as of 2024/04/01. Pick the latest commit that works.
-git checkout dfd4a6441377391a53dd942efa1e228d90d2627c
+git checkout 0c80b315a00a944b6c2a0284f84f956e577697b8
+: # dfd4a6441377391a53dd942efa1e228d90d2627c
 sed -i 's/-fsanitize=address//g' ./cmake/FuzzTestFlagSetup.cmake
 sed -i 's/-DADDRESS_SANITIZER//g' ./cmake/FuzzTestFlagSetup.cmake
 
diff --git a/tests/oss-fuzz/build.sh b/tests/oss-fuzz/build.sh
index c56c0d6f3a..6a9c7d457c 100755
--- a/tests/oss-fuzz/build.sh
+++ b/tests/oss-fuzz/build.sh
@@ -121,12 +121,14 @@ this_dir=\$(dirname \"\$0\")
 export TEST_DATA_DIRS=\$this_dir/corpus
 chmod +x \$this_dir/$fuzz_basename
 ARGS=\$*
-ARGS=\$(echo \${ARGS} | sed \"s/-timeout=\\([0-9]\\+\\)/-fuzz_for=\1s/g\")
-# Keep rss_limit_mb
+FUZZTEST_FUZZ_FOR_ARGS=\$(echo \${ARGS} | sed \"s/.*-timeout=\\([0-9]\\+\\).*/--fuzz_for=\1s/g\")
+#ARGS=\$(echo \${ARGS} | sed \"s/-timeout=\\([0-9]\\+\\)/ /g\")
+FUZZTEST_RSS_ARGS=\$(echo \${ARGS} | sed \"s/.*-rss_limit_mb=\\([0-9]\\+\\).*/--rss_limit_mb=\1/g\")
+ARGS=\$(echo \${ARGS} | sed \"s/-rss_limit_mb=\\([0-9]\\+\\)/ /g\")
 ARGS=\$(echo \${ARGS} | sed \"s/-runs=\\([0-9]\\+\\)/ /g\")
 FUZZTEST_PRNG_SEED=\$(echo \${ARGS} | sed \"s/.*-seed=\\([0-9]\\+\\).*/\1/g\")
 ARGS=\$(echo \${ARGS} | sed \"s/-seed=\\([0-9]\\+\\)/ /g\")
-\$this_dir/$fuzz_basename --fuzz=$fuzz_entrypoint -- \$ARGS
+\$this_dir/$fuzz_basename --fuzz=$fuzz_entrypoint \$FUZZTEST_FUZZ_FOR_ARGS \$FUZZTEST_RSS_ARGS -- \$ARGS
 echo \"\$this_dir/$fuzz_basename --fuzz=$fuzz_entrypoint -- \$ARGS\"
 chmod -x \$this_dir/$fuzz_basename" > $OUT/$TARGET_FUZZER
       chmod +x $OUT/$TARGET_FUZZER