diff --git a/src/listpack.c b/src/listpack.c
index 2dfb321f56..056bf3f67a 100644
--- a/src/listpack.c
+++ b/src/listpack.c
@@ -135,8 +135,6 @@
         assert((p) >= (lp) + LP_HDR_SIZE && (p) + (len) < (lp) + lpGetTotalBytes((lp))); \
     } while (0)
 
-static inline void lpAssertValidEntry(unsigned char *lp, size_t lpbytes, unsigned char *p);
-
 /* Don't let listpacks grow over 1GB in any case, don't wanna risk overflow in
  * Total Bytes header field */
 #define LISTPACK_MAX_SAFETY_SIZE (1 << 30)
@@ -473,9 +471,9 @@ unsigned char *lpSkip(unsigned char *p) {
  * already pointed to the last element of the listpack. */
 unsigned char *lpNext(unsigned char *lp, unsigned char *p) {
     assert(p);
+    (void)(lp);
     p = lpSkip(p);
     if (p[0] == LP_EOF) return NULL;
-    lpAssertValidEntry(lp, lpBytes(lp), p);
     return p;
 }
 
@@ -489,7 +487,6 @@ unsigned char *lpPrev(unsigned char *lp, unsigned char *p) {
     uint64_t prevlen = lpDecodeBacklen(p);
     prevlen += lpEncodeBacklen(NULL, prevlen);
     p -= prevlen - 1; /* Seek the first byte of the previous entry. */
-    lpAssertValidEntry(lp, lpBytes(lp), p);
     return p;
 }
 
@@ -498,7 +495,6 @@ unsigned char *lpPrev(unsigned char *lp, unsigned char *p) {
 unsigned char *lpFirst(unsigned char *lp) {
     unsigned char *p = lp + LP_HDR_SIZE; /* Skip the header. */
     if (p[0] == LP_EOF) return NULL;
-    lpAssertValidEntry(lp, lpBytes(lp), p);
     return p;
 }
 
@@ -727,10 +723,7 @@ unsigned char *lpFind(unsigned char *lp, unsigned char *p, unsigned char *s, uin
 
         /* The next call to lpGetWithSize could read at most 8 bytes past `p`
          * We use the slower validation call only when necessary. */
-        if (p + 8 >= lp + lp_bytes)
-            lpAssertValidEntry(lp, lp_bytes, p);
-        else
-            assert(p >= lp + LP_HDR_SIZE && p < lp + lp_bytes);
+        if (p + 8 < lp + lp_bytes) assert(p >= lp + LP_HDR_SIZE && p < lp + lp_bytes);
         if (p[0] == LP_EOF) break;
     }
 
@@ -1000,7 +993,6 @@ unsigned char *lpDeleteRangeWithEntry(unsigned char *lp, unsigned char **p, unsi
         deleted++;
         tail = lpSkip(tail);
         if (tail[0] == LP_EOF) break;
-        lpAssertValidEntry(lp, bytes, tail);
     }
 
     /* Store the offset of the element 'first', so that we can obtain its
@@ -1309,11 +1301,6 @@ int lpValidateNext(unsigned char *lp, unsigned char **pp, size_t lpbytes) {
 #undef OUT_OF_RANGE
 }
 
-/* Validate that the entry doesn't reach outside the listpack allocation. */
-static inline void lpAssertValidEntry(unsigned char *lp, size_t lpbytes, unsigned char *p) {
-    assert(lpValidateNext(lp, &p, lpbytes));
-}
-
 /* Validate the integrity of the data structure.
  * when `deep` is 0, only the integrity of the header is validated.
  * when `deep` is 1, we scan all the entries one by one. */
diff --git a/tests/integration/corrupt-dump-fuzzer.tcl b/tests/integration/corrupt-dump-fuzzer.tcl
deleted file mode 100644
index 65f5c673dc..0000000000
--- a/tests/integration/corrupt-dump-fuzzer.tcl
+++ /dev/null
@@ -1,241 +0,0 @@
-# tests of corrupt listpack payload with valid CRC
-
-# The fuzzer can cause corrupt the state in many places, which could
-# mess up the reply, so we decided to skip logreqres.
-tags {"dump" "corruption" "external:skip" "logreqres:skip"} {
-
-# catch sigterm so that in case one of the random command hangs the test,
-# usually due to the server not putting a response in the output buffers,
-# we'll know which command it was
-if { ! [ catch {
-    package require Tclx
-} err ] } {
-    signal error SIGTERM
-}
-
-proc generate_collections {suffix elements} {
-    set rd [valkey_deferring_client]
-    for {set j 0} {$j < $elements} {incr j} {
-        # add both string values and integers
-        if {$j % 2 == 0} {set val $j} else {set val "_$j"}
-        $rd hset hash$suffix $j $val
-        $rd lpush list$suffix $val
-        $rd zadd zset$suffix $j $val
-        $rd sadd set$suffix $val
-        $rd xadd stream$suffix * item 1 value $val
-    }
-    for {set j 0} {$j < $elements * 5} {incr j} {
-        $rd read ; # Discard replies
-    }
-    $rd close
-}
-
-# generate keys with various types and encodings
-proc generate_types {} {
-    r config set list-max-ziplist-size 5
-    r config set hash-max-ziplist-entries 5
-    r config set set-max-listpack-entries 5
-    r config set zset-max-ziplist-entries 5
-    r config set stream-node-max-entries 5
-
-    # create small (ziplist / listpack encoded) objects with 3 items
-    generate_collections "" 3
-
-    # add some metadata to the stream
-    r xgroup create stream mygroup 0
-    set records [r xreadgroup GROUP mygroup Alice COUNT 2 STREAMS stream >]
-    r xdel stream [lindex [lindex [lindex [lindex $records 0] 1] 1] 0]
-    r xack stream mygroup [lindex [lindex [lindex [lindex $records 0] 1] 0] 0]
-
-    # create other non-collection types
-    r incr int
-    r set string str
-
-    # create bigger objects with 10 items (more than a single ziplist / listpack)
-    generate_collections big 10
-
-    # make sure our big stream also has a listpack record that has different
-    # field names than the master recorded
-    r xadd streambig * item 1 value 1
-    r xadd streambig * item 1 unique value
-}
-
-proc corrupt_payload {payload} {
-    set len [string length $payload]
-    set count 1 ;# usually corrupt only one byte
-    if {rand() > 0.9} { set count 2 }
-    while { $count > 0 } {
-        set idx [expr {int(rand() * $len)}]
-        set ch [binary format c [expr {int(rand()*255)}]]
-        set payload [string replace $payload $idx $idx $ch]
-        incr count -1
-    }
-    return $payload
-}
-
-# fuzzy tester for corrupt RESTORE payloads
-# valgrind will make sure there were no leaks in the rdb loader error handling code
-foreach sanitize_dump {no yes} {
-    if {$::accurate} {
-        set min_duration [expr {60 * 10}] ;# run at least 10 minutes
-        set min_cycles 1000 ;# run at least 1k cycles (max 16 minutes)
-    } else {
-        set min_duration 10 ; # run at least 10 seconds
-        set min_cycles 10 ; # run at least 10 cycles
-    }
-
-    # Don't execute this on FreeBSD due to a yet-undiscovered memory issue
-    # which causes tclsh to bloat.
-    if {[exec uname] == "FreeBSD"} {
-        set min_cycles 1
-        set min_duration 1
-    }
-
-    test "Fuzzer corrupt restore payloads - sanitize_dump: $sanitize_dump" {
-        if {$min_duration * 2 > $::timeout} {
-            fail "insufficient timeout"
-        }
-        # start a server, fill with data and save an RDB file once (avoid re-save)
-        start_server [list overrides [list "save" "" use-exit-on-panic yes crash-memcheck-enabled no loglevel verbose] ] {
-            set stdout [srv 0 stdout]
-            r config set sanitize-dump-payload $sanitize_dump
-            r debug set-skip-checksum-validation 1
-            set start_time [clock seconds]
-            generate_types
-            set dbsize [r dbsize]
-            r save
-            set cycle 0
-            set stat_terminated_in_restore 0
-            set stat_terminated_in_traffic 0
-            set stat_terminated_by_signal 0
-            set stat_successful_restore 0
-            set stat_rejected_restore 0
-            set stat_traffic_commands_sent 0
-            # repeatedly DUMP a random key, corrupt it and try RESTORE into a new key
-            while true {
-                set k [r randomkey]
-                set dump [r dump $k]
-                set dump [corrupt_payload $dump]
-                set printable_dump [string2printable $dump]
-                set restore_failed false
-                set report_and_restart false
-                set sent {}
-                # RESTORE can fail, but hopefully not terminate
-                if { [catch { r restore "_$k" 0 $dump REPLACE } err] } {
-                    set restore_failed true
-                    # skip if return failed with an error response.
-                    if {[string match "ERR*" $err]} {
-                        incr stat_rejected_restore
-                    } else {
-                        set report_and_restart true
-                        incr stat_terminated_in_restore
-                        write_log_line 0 "corrupt payload: $printable_dump"
-                        if {$sanitize_dump == yes} {
-                            puts "Server crashed in RESTORE with payload: $printable_dump"
-                        }
-                    }
-                } else {
-                    r ping ;# an attempt to check if the server didn't terminate (this will throw an error that will terminate the tests)
-                }
-
-                set print_commands false
-                if {!$restore_failed} {
-                    # if RESTORE didn't fail or terminate, run some random traffic on the new key
-                    incr stat_successful_restore
-                    if { [ catch {
-                        set sent [generate_fuzzy_traffic_on_key "_$k" 1] ;# traffic for 1 second
-                        incr stat_traffic_commands_sent [llength $sent]
-                        r del "_$k" ;# in case the server terminated, here's where we'll detect it.
-                        if {$dbsize != [r dbsize]} {
-                            puts "unexpected keys"
-                            puts "keys: [r keys *]"
-                            puts "commands leading to it:"
-                            foreach cmd $sent {
-                                foreach arg $cmd {
-                                    puts -nonewline "[string2printable $arg] "
-                                }
-                                puts ""
-                            }
-                            exit 1
-                        }
-                    } err ] } {
-                        set err [format "%s" $err] ;# convert to string for pattern matching
-                        if {[string match "*SIGTERM*" $err]} {
-                            puts "payload that caused test to hang: $printable_dump"
-                            if {$::dump_logs} {
-                                set srv [get_srv 0]
-                                dump_server_log $srv
-                            }
-                            exit 1
-                        }
-                        # if the server terminated update stats and restart it
-                        set report_and_restart true
-                        incr stat_terminated_in_traffic
-                        set by_signal [count_log_message 0 "crashed by signal"]
-                        incr stat_terminated_by_signal $by_signal
-
-                        if {$by_signal != 0 || $sanitize_dump == yes} {
-                            if {$::dump_logs} {
-                                set srv [get_srv 0]
-                                dump_server_log $srv
-                            }
-
-                            puts "Server crashed (by signal: $by_signal), with payload: $printable_dump"
-                            set print_commands true
-                        }
-                    }
-                }
-
-                # check valgrind report for invalid reads after each RESTORE
-                # payload so that we have a report that is easier to reproduce
-                set valgrind_errors [find_valgrind_errors [srv 0 stderr] false]
-                set asan_errors [sanitizer_errors_from_file [srv 0 stderr]]
-                if {$valgrind_errors != "" || $asan_errors != ""} {
-                    puts "valgrind or asan found an issue for payload: $printable_dump"
-                    set report_and_restart true
-                    set print_commands true
-                }
-
-                if {$report_and_restart} {
-                    if {$print_commands} {
-                        puts "violating commands:"
-                        foreach cmd $sent {
-                            foreach arg $cmd {
-                                puts -nonewline "[string2printable $arg] "
-                            }
-                            puts ""
-                        }
-                    }
-
-                    # restart the server and re-apply debug configuration
-                    write_log_line 0 "corrupt payload: $printable_dump"
-                    restart_server 0 true true
-                    r config set sanitize-dump-payload $sanitize_dump
-                    r debug set-skip-checksum-validation 1
-                }
-
-                incr cycle
-                if { ([clock seconds]-$start_time) >= $min_duration && $cycle >= $min_cycles} {
-                    break
-                }
-            }
-            if {$::verbose} {
-                puts "Done $cycle cycles in [expr {[clock seconds]-$start_time}] seconds."
-                puts "RESTORE: successful: $stat_successful_restore, rejected: $stat_rejected_restore"
-                puts "Total commands sent in traffic: $stat_traffic_commands_sent, crashes during traffic: $stat_terminated_in_traffic ($stat_terminated_by_signal by signal)."
-            }
-        }
-        # if we run sanitization we never expect the server to crash at runtime
-        if {$sanitize_dump == yes} {
-            assert_equal $stat_terminated_in_restore 0
-            assert_equal $stat_terminated_in_traffic 0
-        }
-        # make sure all terminations where due to assertion and not a SIGSEGV
-        assert_equal $stat_terminated_by_signal 0
-    }
-}
-
-
-
-} ;# tags
-
diff --git a/tests/integration/corrupt-dump.tcl b/tests/integration/corrupt-dump.tcl
deleted file mode 100644
index d8537f0c57..0000000000
--- a/tests/integration/corrupt-dump.tcl
+++ /dev/null
@@ -1,833 +0,0 @@
-# tests of corrupt ziplist payload with valid CRC
-# * setting crash-memcheck-enabled to no to avoid issues with valgrind
-# * setting use-exit-on-panic to yes so that valgrind can search for leaks
-# * setting debug set-skip-checksum-validation to 1 on some tests for which we
-#   didn't bother to fake a valid checksum
-# * some tests set sanitize-dump-payload to no and some to yet, depending on
-#   what we want to test
-
-tags {"dump" "corruption" "external:skip"} {
-
-# We only run OOM related tests on x86_64 and aarch64, as jemalloc on other
-# platforms (notably s390x) may actually succeed very large allocations. As
-# a result the test may hang for a very long time at the cleanup phase,
-# iterating as many as 2^61 hash table slots.
-
-set arch_name [exec uname -m]
-set run_oom_tests [expr {$arch_name == "x86_64" || $arch_name == "aarch64"}]
-
-set corrupt_payload_7445 "\x0E\x01\x1D\x1D\x00\x00\x00\x16\x00\x00\x00\x03\x00\x00\x04\x43\x43\x43\x43\x06\x04\x42\x42\x42\x42\x06\x3F\x41\x41\x41\x41\xFF\x09\x00\x88\xA5\xCA\xA8\xC5\x41\xF4\x35"
-
-test {corrupt payload: #7445 - with sanitize} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        catch {
-            r restore key 0 $corrupt_payload_7445
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: hash with valid zip list header, invalid entry len} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        catch {
-            r restore key 0 "\x0D\x1B\x1B\x00\x00\x00\x16\x00\x00\x00\x04\x00\x00\x02\x61\x00\x04\x02\x62\x00\x04\x14\x63\x00\x04\x02\x64\x00\xFF\x09\x00\xD9\x10\x54\x92\x15\xF5\x5F\x52"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: invalid zlbytes header} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        catch {
-            r restore key 0 "\x0D\x1B\x25\x00\x00\x00\x16\x00\x00\x00\x04\x00\x00\x02\x61\x00\x04\x02\x62\x00\x04\x02\x63\x00\x04\x02\x64\x00\xFF\x09\x00\xB7\xF7\x6E\x9F\x43\x43\x14\xC6"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: valid zipped hash header, dup records} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        catch {
-            r restore key 0 "\x0D\x1B\x1B\x00\x00\x00\x16\x00\x00\x00\x04\x00\x00\x02\x61\x00\x04\x02\x62\x00\x04\x02\x61\x00\x04\x02\x64\x00\xFF\x09\x00\xA1\x98\x36\x78\xCC\x8E\x93\x2E"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: quicklist big ziplist prev len} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        catch {r restore key 0 "\x0E\x01\x13\x13\x00\x00\x00\x0E\x00\x00\x00\x02\x00\x00\x02\x61\x00\x0E\x02\x62\x00\xFF\x09\x00\x49\x97\x30\xB2\x0D\xA1\xED\xAA"} err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: quicklist small ziplist prev len} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        catch {
-            r restore key 0 "\x0E\x01\x13\x13\x00\x00\x00\x0E\x00\x00\x00\x02\x00\x00\x02\x61\x00\x02\x02\x62\x00\xFF\x09\x00\xC7\x71\x03\x97\x07\x75\xB0\x63"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: quicklist ziplist wrong count} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        catch {r restore key 0 "\x0E\x01\x13\x13\x00\x00\x00\x0E\x00\x00\x00\x03\x00\x00\x02\x61\x00\x04\x02\x62\x00\xFF\x09\x00\x4D\xE2\x0A\x2F\x08\x25\xDF\x91"} err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: #3080 - quicklist} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        catch {
-            r RESTORE key 0 "\x0E\x01\x80\x00\x00\x00\x10\x41\x41\x41\x41\x41\x41\x41\x41\x02\x00\x00\x80\x41\x41\x41\x41\x07\x00\x03\xC7\x1D\xEF\x54\x68\xCC\xF3"
-            r DUMP key ;# DUMP was used in the original issue, but now even with shallow sanitization restore safely fails, so this is dead code
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: quicklist with empty ziplist} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {r restore key 0 "\x0E\x01\x0B\x0B\x00\x00\x00\x0A\x00\x00\x00\x00\x00\xFF\x09\x00\xC2\x69\x37\x83\x3C\x7F\xFE\x6F" replace} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: quicklist encoded_len is 0} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        catch { r restore _list 0 "\x12\x01\x01\x00\x0a\x00\x8f\xc6\xc0\x57\x1c\x0a\xb3\x3c" replace } err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: quicklist listpack entry start with EOF} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        catch { r restore _list 0 "\x12\x01\x02\x0b\x0b\x00\x00\x00\x01\x00\x81\x61\x02\xff\xff\x0a\x00\x7e\xd8\xde\x5b\x0d\xd7\x70\xb8" replace } err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: #3080 - ziplist} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        # shallow sanitization is enough for restore to safely reject the payload with wrong size
-        r config set sanitize-dump-payload no
-        catch {
-            r RESTORE key 0 "\x0A\x80\x00\x00\x00\x10\x41\x41\x41\x41\x41\x41\x41\x41\x02\x00\x00\x80\x41\x41\x41\x41\x07\x00\x39\x5B\x49\xE0\xC1\xC6\xDD\x76"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: load corrupted rdb with no CRC - #3505} {
-    set server_path [tmpdir "server.rdb-corruption-test"]
-    exec cp tests/assets/corrupt_ziplist.rdb $server_path
-    set srv [start_server [list overrides [list "dir" $server_path "dbfilename" "corrupt_ziplist.rdb" loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no sanitize-dump-payload no]]]
-
-    # wait for termination
-    wait_for_condition 100 50 {
-        ! [is_alive [dict get $srv pid]]
-    } else {
-        fail "rdb loading didn't fail"
-    }
-
-    set stdout [dict get $srv stdout]
-    assert_equal [count_message_lines $stdout "Terminating server after rdb file reading failure."]  1
-    assert_lessthan 1 [count_message_lines $stdout "integrity check failed"]
-    kill_server $srv ;# let valgrind look for issues
-}
-
-foreach sanitize_dump {no yes} {
-    test {corrupt payload: load corrupted rdb with empty keys} {
-        set server_path [tmpdir "server.rdb-corruption-empty-keys-test"]
-        exec cp tests/assets/corrupt_empty_keys.rdb $server_path
-        start_server [list overrides [list "dir" $server_path "dbfilename" "corrupt_empty_keys.rdb" "sanitize-dump-payload" $sanitize_dump]] {
-            r select 0
-            assert_equal [r dbsize] 0
-
-            verify_log_message 0 "*skipping empty key: set*" 0
-            verify_log_message 0 "*skipping empty key: list_quicklist*" 0
-            verify_log_message 0 "*skipping empty key: list_quicklist_empty_ziplist*" 0
-            verify_log_message 0 "*skipping empty key: list_ziplist*" 0
-            verify_log_message 0 "*skipping empty key: hash*" 0
-            verify_log_message 0 "*skipping empty key: hash_ziplist*" 0
-            verify_log_message 0 "*skipping empty key: zset*" 0
-            verify_log_message 0 "*skipping empty key: zset_ziplist*" 0
-            verify_log_message 0 "*skipping empty key: zset_listpack*" 0
-            verify_log_message 0 "*empty keys skipped: 9*" 0
-        }
-    }
-}
-
-test {corrupt payload: listpack invalid size header} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        catch {
-            r restore key 0 "\x0F\x01\x10\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x02\x40\x55\x5F\x00\x00\x00\x0F\x00\x01\x01\x00\x01\x02\x01\x88\x31\x00\x00\x00\x00\x00\x00\x00\x09\x88\x32\x00\x00\x00\x00\x00\x00\x00\x09\x00\x01\x00\x01\x00\x01\x00\x01\x02\x02\x88\x31\x00\x00\x00\x00\x00\x00\x00\x09\x88\x61\x00\x00\x00\x00\x00\x00\x00\x09\x88\x32\x00\x00\x00\x00\x00\x00\x00\x09\x88\x62\x00\x00\x00\x00\x00\x00\x00\x09\x08\x01\xFF\x0A\x01\x00\x00\x09\x00\x45\x91\x0A\x87\x2F\xA5\xF9\x2E"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*Stream listpack integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: listpack too long entry len} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        catch {
-            r restore key 0 "\x0F\x01\x10\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x02\x40\x55\x55\x00\x00\x00\x0F\x00\x01\x01\x00\x01\x02\x01\x88\x31\x00\x00\x00\x00\x00\x00\x00\x09\x88\x32\x00\x00\x00\x00\x00\x00\x00\x09\x00\x01\x00\x01\x00\x01\x00\x01\x02\x02\x89\x31\x00\x00\x00\x00\x00\x00\x00\x09\x88\x61\x00\x00\x00\x00\x00\x00\x00\x09\x88\x32\x00\x00\x00\x00\x00\x00\x00\x09\x88\x62\x00\x00\x00\x00\x00\x00\x00\x09\x08\x01\xFF\x0A\x01\x00\x00\x09\x00\x40\x63\xC9\x37\x03\xA2\xE5\x68"
-        } err
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "ASSERTION FAILED"] 1
-    }
-}
-
-test {corrupt payload: listpack very long entry len} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        catch {
-            # This will catch migrated payloads from v6.2.x
-            r restore key 0 "\x0F\x01\x10\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x02\x40\x55\x55\x00\x00\x00\x0F\x00\x01\x01\x00\x01\x02\x01\x88\x31\x00\x00\x00\x00\x00\x00\x00\x09\x88\x32\x00\x00\x00\x00\x00\x00\x00\x09\x00\x01\x00\x01\x00\x01\x00\x01\x02\x02\x88\x31\x00\x00\x00\x00\x00\x00\x00\x09\x88\x61\x00\x00\x00\x00\x00\x00\x00\x09\x88\x32\x00\x00\x00\x00\x00\x00\x00\x09\x9C\x62\x00\x00\x00\x00\x00\x00\x00\x09\x08\x01\xFF\x0A\x01\x00\x00\x09\x00\x63\x6F\x42\x8E\x7C\xB5\xA2\x9D"
-        } err
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "ASSERTION FAILED"] 1
-    }
-}
-
-test {corrupt payload: listpack too long entry prev len} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        catch {
-            r restore key 0 "\x0F\x01\x10\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x02\x40\x55\x55\x00\x00\x00\x0F\x00\x01\x01\x00\x15\x02\x01\x88\x31\x00\x00\x00\x00\x00\x00\x00\x09\x88\x32\x00\x00\x00\x00\x00\x00\x00\x09\x00\x01\x00\x01\x00\x01\x00\x01\x02\x02\x88\x31\x00\x00\x00\x00\x00\x00\x00\x09\x88\x61\x00\x00\x00\x00\x00\x00\x00\x09\x88\x32\x00\x00\x00\x00\x00\x00\x00\x09\x88\x62\x00\x00\x00\x00\x00\x00\x00\x09\x08\x01\xFF\x0A\x01\x00\x00\x09\x00\x06\xFB\x44\x24\x0A\x8E\x75\xEA"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*Stream listpack integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: stream with duplicate consumers} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        catch {
-            r restore key 0 "\x0F\x00\x00\x00\x00\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x00\x00\x00\x02\x04\x6E\x61\x6D\x65\x2A\x4C\xAA\x9A\x7D\x01\x00\x00\x00\x04\x6E\x61\x6D\x65\x2B\x4C\xAA\x9A\x7D\x01\x00\x00\x00\x0A\x00\xCC\xED\x8C\xA7\x62\xEE\xC7\xC8"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*Duplicate stream consumer detected*" 0
-        r ping
-    }
-}
-
-test {corrupt payload: hash ziplist with duplicate records} {
-    # when we do perform full sanitization, we expect duplicate records to fail the restore
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _hash 0 "\x0D\x3D\x3D\x00\x00\x00\x3A\x00\x00\x00\x14\x13\x00\xF5\x02\xF5\x02\xF2\x02\x53\x5F\x31\x04\xF3\x02\xF3\x02\xF7\x02\xF7\x02\xF8\x02\x02\x5F\x37\x04\xF1\x02\xF1\x02\xF6\x02\x02\x5F\x35\x04\xF4\x02\x02\x5F\x33\x04\xFA\x02\x02\x5F\x39\x04\xF9\x02\xF9\xFF\x09\x00\xB5\x48\xDE\x62\x31\xD0\xE5\x63" } err
-        assert_match "*Bad data format*" $err
-    }
-}
-
-test {corrupt payload: hash listpack with duplicate records} {
-    # when we do perform full sanitization, we expect duplicate records to fail the restore
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _hash 0 "\x10\x17\x17\x00\x00\x00\x04\x00\x82\x61\x00\x03\x82\x62\x00\x03\x82\x61\x00\x03\x82\x64\x00\x03\xff\x0a\x00\xc0\xcf\xa6\x87\xe5\xa7\xc5\xbe" } err
-        assert_match "*Bad data format*" $err
-    }
-}
-
-test {corrupt payload: hash listpack with duplicate records - convert} {
-    # when we do NOT perform full sanitization, but we convert to hash, we expect duplicate records panic
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r config set hash-max-listpack-entries 1
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _hash 0 "\x10\x17\x17\x00\x00\x00\x04\x00\x82\x61\x00\x03\x82\x62\x00\x03\x82\x61\x00\x03\x82\x64\x00\x03\xff\x0a\x00\xc0\xcf\xa6\x87\xe5\xa7\xc5\xbe" } err
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "listpack with dup elements"] 1
-    }
-}
-
-test {corrupt payload: hash ziplist uneven record count} {
-    # when we do NOT perform full sanitization, but shallow sanitization can detect uneven count
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _hash 0 "\r\x1b\x1b\x00\x00\x00\x16\x00\x00\x00\x04\x00\x00\x02a\x00\x04\x02b\x00\x04\x02a\x00\x04\x02d\x00\xff\t\x00\xa1\x98\x36x\xcc\x8e\x93\x2e" } err
-        assert_match "*Bad data format*" $err
-    }
-}
-
-test {corrupt payload: hash duplicate records} {
-    # when we do perform full sanitization, we expect duplicate records to fail the restore
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _hash 0 "\x04\x02\x01a\x01b\x01a\x01d\t\x00\xc6\x9c\xab\xbc\bk\x0c\x06" } err
-        assert_match "*Bad data format*" $err
-    }
-}
-
-test {corrupt payload: hash empty zipmap} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _hash 0 "\x09\x02\x00\xFF\x09\x00\xC0\xF1\xB8\x67\x4C\x16\xAC\xE3" } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*Zipmap integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: fuzzer findings - NPD in streamIteratorGetID} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {
-            r RESTORE key 0 "\x0F\x01\x10\x00\x00\x01\x73\xBD\x68\x48\x71\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x03\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x05\x01\x02\x01\x00\x01\x01\x01\x01\x01\x82\x5F\x31\x03\x05\x01\x02\x01\x00\x01\x02\x01\x01\x01\x02\x01\x48\x01\xFF\x03\x81\x00\x00\x01\x73\xBD\x68\x48\x71\x02\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x73\xBD\x68\x48\x71\x00\x01\x00\x00\x01\x73\xBD\x68\x48\x71\x00\x00\x00\x00\x00\x00\x00\x00\x72\x48\x68\xBD\x73\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\x72\x48\x68\xBD\x73\x01\x00\x00\x01\x00\x00\x01\x73\xBD\x68\x48\x71\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\x80\xCD\xB0\xD5\x1A\xCE\xFF\x10"
-            r XREVRANGE key 725 233
-        }
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "ASSERTION FAILED"] 1
-    }
-}
-
-test {corrupt payload: fuzzer findings - listpack NPD on invalid stream} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {
-            r RESTORE _stream 0 "\x0F\x01\x10\x00\x00\x01\x73\xDC\xB6\x6B\xF1\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x03\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x05\x01\x02\x01\x1F\x01\x00\x01\x01\x01\x6D\x5F\x31\x03\x05\x01\x02\x01\x29\x01\x00\x01\x01\x01\x02\x01\x05\x01\xFF\x03\x81\x00\x00\x01\x73\xDC\xB6\x6C\x1A\x00\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x73\xDC\xB6\x6B\xF1\x00\x01\x00\x00\x01\x73\xDC\xB6\x6B\xF1\x00\x00\x00\x00\x00\x00\x00\x00\x4B\x6C\xB6\xDC\x73\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\x3D\x6C\xB6\xDC\x73\x01\x00\x00\x01\x00\x00\x01\x73\xDC\xB6\x6B\xF1\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\xC7\x7D\x1C\xD7\x04\xFF\xE6\x9D"
-            r XREAD STREAMS _stream 519389898758
-        }
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "ASSERTION FAILED"] 1
-    }
-}
-
-test {corrupt payload: fuzzer findings - NPD in quicklistIndex} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {
-            r RESTORE key 0 "\x0E\x01\x13\x13\x00\x00\x00\x10\x00\x00\x00\x03\x12\x00\xF3\x02\x02\x5F\x31\x04\xF1\xFF\x09\x00\xC9\x4B\x31\xFE\x61\xC0\x96\xFE"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: fuzzer findings - encoded entry header reach outside the allocation} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r debug set-skip-checksum-validation 1
-        catch {
-            r RESTORE key 0 "\x0D\x19\x19\x00\x00\x00\x16\x00\x00\x00\x06\x00\x00\xF1\x02\xF1\x02\xF2\x02\x02\x5F\x31\x04\x99\x02\xF3\xFF\x09\x00\xC5\xB8\x10\xC0\x8A\xF9\x16\xDF"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-
-test {corrupt payload: fuzzer findings - invalid ziplist encoding} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {
-            r RESTORE _listbig 0 "\x0E\x02\x1B\x1B\x00\x00\x00\x16\x00\x00\x00\x05\x00\x00\x02\x5F\x39\x04\xF9\x02\x86\x5F\x37\x04\xF7\x02\x02\x5F\x35\xFF\x19\x19\x00\x00\x00\x16\x00\x00\x00\x05\x00\x00\xF5\x02\x02\x5F\x33\x04\xF3\x02\x02\x5F\x31\x04\xF1\xFF\x09\x00\x0C\xFC\x99\x2C\x23\x45\x15\x60"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: fuzzer findings - hash crash} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        r RESTORE _hash 0 "\x0D\x19\x19\x00\x00\x00\x16\x00\x00\x00\x06\x00\x00\xF1\x02\xF1\x02\xF2\x02\x02\x5F\x31\x04\xF3\x02\xF3\xFF\x09\x00\x38\xB8\x10\xC0\x8A\xF9\x16\xDF"
-        r HSET _hash 394891450 1635910264
-        r HMGET _hash 887312884855
-    }
-}
-
-test {corrupt payload: fuzzer findings - uneven entry count in hash} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r debug set-skip-checksum-validation 1
-        catch {
-            r RESTORE _hashbig 0 "\x0D\x3D\x3D\x00\x00\x00\x38\x00\x00\x00\x14\x00\x00\xF2\x02\x02\x5F\x31\x04\x1C\x02\xF7\x02\xF1\x02\xF1\x02\xF5\x02\xF5\x02\xF4\x02\x02\x5F\x33\x04\xF6\x02\x02\x5F\x35\x04\xF8\x02\x02\x5F\x37\x04\xF9\x02\xF9\x02\xF3\x02\xF3\x02\xFA\x02\x02\x5F\x39\xFF\x09\x00\x73\xB7\x68\xC8\x97\x24\x8E\x88"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: fuzzer findings - invalid read in lzf_decompress} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _setbig 0 "\x02\x03\x02\x5F\x31\xC0\x02\xC3\x00\x09\x00\xE6\xDC\x76\x44\xFF\xEB\x3D\xFE" } err
-        assert_match "*Bad data format*" $err
-    }
-}
-
-test {corrupt payload: fuzzer findings - leak in rdbloading due to dup entry in set} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _setbig 0 "\x02\x0A\x02\x5F\x39\xC0\x06\x02\x5F\x31\xC0\x00\xC0\x04\x02\x5F\x35\xC0\x02\xC0\x08\x02\x5F\x31\x02\x5F\x33\x09\x00\x7A\x5A\xFB\x90\x3A\xE9\x3C\xBE" } err
-        assert_match "*Bad data format*" $err
-    }
-}
-
-test {corrupt payload: fuzzer findings - empty intset} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {r RESTORE _setbig 0 "\x02\xC0\xC0\x06\x02\x5F\x39\xC0\x02\x02\x5F\x33\xC0\x00\x02\x5F\x31\xC0\x04\xC0\x08\x02\x5F\x37\x02\x5F\x35\x09\x00\xC5\xD4\x6D\xBA\xAD\x14\xB7\xE7"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - zset ziplist entry lensize is 0} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {r RESTORE _zsetbig 0 "\x0C\x3D\x3D\x00\x00\x00\x3A\x00\x00\x00\x14\x00\x00\xF1\x02\xF1\x02\x02\x5F\x31\x04\xF2\x02\xF3\x02\xF3\x02\x02\x5F\x33\x04\xF4\x02\xEE\x02\xF5\x02\x02\x5F\x35\x04\xF6\x02\xF7\x02\xF7\x02\x02\x5F\x37\x04\xF8\x02\xF9\x02\xF9\x02\x02\x5F\x39\x04\xFA\xFF\x09\x00\xAE\xF9\x77\x2A\x47\x24\x33\xF6"} err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*Zset ziplist integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: fuzzer findings - valgrind ziplist prevlen reaches outside the ziplist} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {r RESTORE _listbig 0 "\x0E\x02\x1B\x1B\x00\x00\x00\x16\x00\x00\x00\x05\x00\x00\x02\x5F\x39\x04\xF9\x02\x02\x5F\x37\x04\xF7\x02\x02\x5F\x35\xFF\x19\x19\x00\x00\x00\x16\x00\x00\x00\x05\x00\x00\xF5\x02\x02\x5F\x33\x04\xF3\x95\x02\x5F\x31\x04\xF1\xFF\x09\x00\x0C\xFC\x99\x2C\x23\x45\x15\x60"} err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: fuzzer findings - valgrind - bad rdbLoadDoubleValue} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _list 0 "\x03\x01\x11\x11\x00\x00\x00\x0A\x00\x00\x00\x01\x00\x00\xD0\x07\x1A\xE9\x02\xFF\x09\x00\x1A\x06\x07\x32\x41\x28\x3A\x46" } err
-        assert_match "*Bad data format*" $err
-    }
-}
-
-test {corrupt payload: fuzzer findings - valgrind ziplist prev too big} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {r RESTORE _list 0 "\x0E\x01\x13\x13\x00\x00\x00\x10\x00\x00\x00\x03\x00\x00\xF3\x02\x02\x5F\x31\xC1\xF1\xFF\x09\x00\xC9\x4B\x31\xFE\x61\xC0\x96\xFE"} err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: fuzzer findings - lzf decompression fails, avoid valgrind invalid read} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {r RESTORE _stream 0 "\x0F\x02\x10\x00\x00\x01\x73\xDD\xAA\x2A\xB9\x00\x00\x00\x00\x00\x00\x00\x00\xC3\x40\x4B\x40\x5C\x18\x5C\x00\x00\x00\x24\x00\x05\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x00\x01\x20\x03\x00\x05\x20\x1C\x40\x07\x05\x01\x01\x82\x5F\x31\x03\x80\x0D\x40\x00\x00\x02\x60\x19\x40\x27\x40\x19\x00\x33\x60\x19\x40\x29\x02\x01\x01\x04\x20\x19\x00\xFF\x10\x00\x00\x01\x73\xDD\xAA\x2A\xBC\x00\x00\x00\x00\x00\x00\x00\x00\xC3\x40\x4D\x40\x5E\x18\x5E\x00\x00\x00\x24\x00\x05\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x06\x01\x01\x82\x5F\x35\x03\x05\x20\x1E\x17\x0B\x03\x01\x01\x06\x01\x40\x0B\x00\x01\x60\x0D\x02\x82\x5F\x37\x60\x19\x80\x00\x00\x08\x60\x19\x80\x27\x02\x82\x5F\x39\x20\x19\x00\xFF\x0A\x81\x00\x00\x01\x73\xDD\xAA\x2A\xBE\x00\x00\x09\x00\x21\x85\x77\x43\x71\x7B\x17\x88"} err
-        assert_match "*Bad data format*" $err
-    }
-}
-
-test {corrupt payload: fuzzer findings - stream bad lp_count} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _stream 0 "\x0F\x01\x10\x00\x00\x01\x73\xDE\xDF\x7D\x9B\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x03\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x56\x01\x02\x01\x22\x01\x00\x01\x01\x01\x82\x5F\x31\x03\x05\x01\x02\x01\x2C\x01\x00\x01\x01\x01\x02\x01\x05\x01\xFF\x03\x81\x00\x00\x01\x73\xDE\xDF\x7D\xC7\x00\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x73\xDE\xDF\x7D\x9B\x00\x01\x00\x00\x01\x73\xDE\xDF\x7D\x9B\x00\x00\x00\x00\x00\x00\x00\x00\xF9\x7D\xDF\xDE\x73\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\xEB\x7D\xDF\xDE\x73\x01\x00\x00\x01\x00\x00\x01\x73\xDE\xDF\x7D\x9B\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\xB2\xA8\xA7\x5F\x1B\x61\x72\xD5"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - stream bad lp_count - unsanitized} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        r RESTORE _stream 0 "\x0F\x01\x10\x00\x00\x01\x73\xDE\xDF\x7D\x9B\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x03\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x56\x01\x02\x01\x22\x01\x00\x01\x01\x01\x82\x5F\x31\x03\x05\x01\x02\x01\x2C\x01\x00\x01\x01\x01\x02\x01\x05\x01\xFF\x03\x81\x00\x00\x01\x73\xDE\xDF\x7D\xC7\x00\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x73\xDE\xDF\x7D\x9B\x00\x01\x00\x00\x01\x73\xDE\xDF\x7D\x9B\x00\x00\x00\x00\x00\x00\x00\x00\xF9\x7D\xDF\xDE\x73\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\xEB\x7D\xDF\xDE\x73\x01\x00\x00\x01\x00\x00\x01\x73\xDE\xDF\x7D\x9B\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\xB2\xA8\xA7\x5F\x1B\x61\x72\xD5"
-        catch { r XREVRANGE _stream 638932639 738}
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "ASSERTION FAILED"] 1
-    }
-}
-
-test {corrupt payload: fuzzer findings - stream integrity check issue} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE _stream 0 "\x0F\x02\x10\x00\x00\x01\x75\x2D\xA2\x90\x67\x00\x00\x00\x00\x00\x00\x00\x00\xC3\x40\x4F\x40\x5C\x18\x5C\x00\x00\x00\x24\x00\x05\x01\x00\x01\x4A\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x00\x01\x20\x03\x00\x05\x20\x1C\x40\x09\x05\x01\x01\x82\x5F\x31\x03\x80\x0D\x00\x02\x20\x0D\x00\x02\xA0\x19\x00\x03\x20\x0B\x02\x82\x5F\x33\xA0\x19\x00\x04\x20\x0D\x00\x04\x20\x19\x00\xFF\x10\x00\x00\x01\x75\x2D\xA2\x90\x67\x00\x00\x00\x00\x00\x00\x00\x05\xC3\x40\x56\x40\x60\x18\x60\x00\x00\x00\x24\x00\x05\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x06\x01\x01\x82\x5F\x35\x03\x05\x20\x1E\x40\x0B\x03\x01\x01\x06\x01\x80\x0B\x00\x02\x20\x0B\x02\x82\x5F\x37\x60\x19\x03\x01\x01\xDF\xFB\x20\x05\x00\x08\x60\x1A\x20\x0C\x00\xFC\x20\x05\x02\x82\x5F\x39\x20\x1B\x00\xFF\x0A\x81\x00\x00\x01\x75\x2D\xA2\x90\x68\x01\x00\x09\x00\x1D\x6F\xC0\x69\x8A\xDE\xF7\x92" } err
-        assert_match "*Bad data format*" $err
-    }
-}
-
-test {corrupt payload: fuzzer findings - infinite loop} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        r RESTORE _stream 0 "\x0F\x01\x10\x00\x00\x01\x75\x3A\xA6\xD0\x93\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x03\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x05\x01\x02\x01\x00\x01\x01\x01\x01\x01\x82\x5F\x31\x03\xFD\x01\x02\x01\x00\x01\x02\x01\x01\x01\x02\x01\x05\x01\xFF\x03\x81\x00\x00\x01\x75\x3A\xA6\xD0\x93\x02\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x75\x3A\xA6\xD0\x93\x00\x01\x00\x00\x01\x75\x3A\xA6\xD0\x93\x00\x00\x00\x00\x00\x00\x00\x00\x94\xD0\xA6\x3A\x75\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\x94\xD0\xA6\x3A\x75\x01\x00\x00\x01\x00\x00\x01\x75\x3A\xA6\xD0\x93\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\xC4\x09\xAD\x69\x7E\xEE\xA6\x2F"
-        catch { r XREVRANGE _stream 288270516 971031845 }
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "ASSERTION FAILED"] 1
-    }
-}
-
-test {corrupt payload: fuzzer findings - hash ziplist too long entry len} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r debug set-skip-checksum-validation 1
-        catch {
-            r RESTORE _hash 0 "\x0D\x3D\x3D\x00\x00\x00\x3A\x00\x00\x00\x14\x13\x00\xF5\x02\xF5\x02\xF2\x02\x53\x5F\x31\x04\xF3\x02\xF3\x02\xF7\x02\xF7\x02\xF8\x02\x02\x5F\x37\x04\xF1\x02\xF1\x02\xF6\x02\x02\x5F\x35\x04\xF4\x02\x02\x5F\x33\x04\xFA\x02\x02\x5F\x39\x04\xF9\x02\xF9\xFF\x09\x00\xB5\x48\xDE\x62\x31\xD0\xE5\x63"
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-if {$run_oom_tests} {
-
-test {corrupt payload: OOM in rdbGenericLoadStringObject} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        catch { r RESTORE x 0 "\x0A\x81\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x13\x00\x00\x00\x0E\x00\x00\x00\x02\x00\x00\x02\x61\x00\x04\x02\x62\x00\xFF\x09\x00\x57\x04\xE5\xCD\xD4\x37\x6C\x57" } err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - OOM in dictExpand} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch { r RESTORE x 0 "\x02\x81\x02\x5F\x31\xC0\x00\xC0\x02\x09\x00\xCD\x84\x2C\xB7\xE8\xA4\x49\x57" } err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-}
-
-test {corrupt payload: fuzzer findings - zset ziplist invalid tail offset} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {r RESTORE _zset 0 "\x0C\x19\x19\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\xF1\x02\xF1\x02\x02\x5F\x31\x04\xF2\x02\xF3\x02\xF3\xFF\x09\x00\x4D\x72\x7B\x97\xCD\x9A\x70\xC1"} err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*Zset ziplist integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: fuzzer findings - negative reply length} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        r RESTORE _stream 0 "\x0F\x01\x10\x00\x00\x01\x75\xCF\xA1\x16\xA7\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x03\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x05\x01\x02\x01\x00\x01\x01\x01\x01\x01\x14\x5F\x31\x03\x05\x01\x02\x01\x00\x01\x02\x01\x01\x01\x02\x01\x05\x01\xFF\x03\x81\x00\x00\x01\x75\xCF\xA1\x16\xA7\x02\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x75\xCF\xA1\x16\xA7\x01\x01\x00\x00\x01\x75\xCF\xA1\x16\xA7\x00\x00\x00\x00\x00\x00\x00\x01\xA7\x16\xA1\xCF\x75\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\xA7\x16\xA1\xCF\x75\x01\x00\x00\x01\x00\x00\x01\x75\xCF\xA1\x16\xA7\x00\x00\x00\x00\x00\x00\x00\x01\x09\x00\x1B\x42\x52\xB8\xDD\x5C\xE5\x4E"
-        catch {r XADD _stream * -956 -2601503852}
-        catch {r XINFO STREAM _stream FULL}
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "ASSERTION FAILED"] 1
-    }
-}
-
-test {corrupt payload: fuzzer findings - valgrind negative malloc} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r RESTORE _key 0 "\x0E\x01\x81\xD6\xD6\x00\x00\x00\x0A\x00\x00\x00\x01\x00\x00\x40\xC8\x6F\x2F\x36\xE2\xDF\xE3\x2E\x26\x64\x8B\x87\xD1\x7A\xBD\xFF\xEF\xEF\x63\x65\xF6\xF8\x8C\x4E\xEC\x96\x89\x56\x88\xF8\x3D\x96\x5A\x32\xBD\xD1\x36\xD8\x02\xE6\x66\x37\xCB\x34\x34\xC4\x52\xA7\x2A\xD5\x6F\x2F\x7E\xEE\xA2\x94\xD9\xEB\xA9\x09\x38\x3B\xE1\xA9\x60\xB6\x4E\x09\x44\x1F\x70\x24\xAA\x47\xA8\x6E\x30\xE1\x13\x49\x4E\xA1\x92\xC4\x6C\xF0\x35\x83\xD9\x4F\xD9\x9C\x0A\x0D\x7A\xE7\xB1\x61\xF5\xC1\x2D\xDC\xC3\x0E\x87\xA6\x80\x15\x18\xBA\x7F\x72\xDD\x14\x75\x46\x44\x0B\xCA\x9C\x8F\x1C\x3C\xD7\xDA\x06\x62\x18\x7E\x15\x17\x24\xAB\x45\x21\x27\xC2\xBC\xBB\x86\x6E\xD8\xBD\x8E\x50\xE0\xE0\x88\xA4\x9B\x9D\x15\x2A\x98\xFF\x5E\x78\x6C\x81\xFC\xA8\xC9\xC8\xE6\x61\xC8\xD1\x4A\x7F\x81\xD6\xA6\x1A\xAD\x4C\xC1\xA2\x1C\x90\x68\x15\x2A\x8A\x36\xC0\x58\xC3\xCC\xA6\x54\x19\x12\x0F\xEB\x46\xFF\x6E\xE3\xA7\x92\xF8\xFF\x09\x00\xD0\x71\xF7\x9F\xF7\x6A\xD6\x2E"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - valgrind invalid read} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r RESTORE _key 0 "\x05\x0A\x02\x5F\x39\x00\x00\x00\x00\x00\x00\x22\x40\xC0\x08\x00\x00\x00\x00\x00\x00\x20\x40\x02\x5F\x37\x00\x00\x00\x00\x00\x00\x1C\x40\xC0\x06\x00\x00\x00\x00\x00\x00\x18\x40\x02\x5F\x33\x00\x00\x00\x00\x00\x00\x14\x40\xC0\x04\x00\x00\x00\x00\x00\x00\x10\x40\x02\x5F\x33\x00\x00\x00\x00\x00\x00\x08\x40\xC0\x02\x00\x00\x00\x00\x00\x00\x00\x40\x02\x5F\x31\x00\x00\x00\x00\x00\x00\xF0\x3F\xC0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\x3C\x66\xD7\x14\xA9\xDA\x3C\x69"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - empty hash ziplist} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r RESTORE _int 0 "\x04\xC0\x01\x09\x00\xF6\x8A\xB6\x7A\x85\x87\x72\x4D"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - stream with no records} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        r restore _stream 0 "\x0F\x01\x10\x00\x00\x01\x78\x4D\x55\x68\x09\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x02\x01\x01\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x05\x01\x03\x01\x3E\x01\x00\x01\x01\x01\x82\x5F\x31\x03\x05\x01\x02\x01\x50\x01\x00\x01\x01\x01\x02\x01\x05\x23\xFF\x02\x81\x00\x00\x01\x78\x4D\x55\x68\x59\x00\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x78\x4D\x55\x68\x47\x00\x01\x00\x00\x01\x78\x4D\x55\x68\x47\x00\x00\x00\x00\x00\x00\x00\x00\x9F\x68\x55\x4D\x78\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\x85\x68\x55\x4D\x78\x01\x00\x00\x01\x00\x00\x01\x78\x4D\x55\x68\x47\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\xF1\xC0\x72\x70\x39\x40\x1E\xA9" replace
-        catch {r XREAD STREAMS _stream $}
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "Guru Meditation"] 1
-    }
-}
-
-test {corrupt payload: fuzzer findings - quicklist ziplist tail followed by extra data which start with 0xff} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {
-            r restore key 0 "\x0E\x01\x11\x11\x00\x00\x00\x0A\x00\x00\x00\x01\x00\x00\xF6\xFF\xB0\x6C\x9C\xFF\x09\x00\x9C\x37\x47\x49\x4D\xDE\x94\xF5" replace
-        } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: fuzzer findings - dict init to huge size} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {r restore key 0 "\x02\x81\xC0\x00\x02\x5F\x31\xC0\x02\x09\x00\xB2\x1B\xE5\x17\x2E\x15\xF4\x6C" replace} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - huge string} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r restore key 0 "\x00\x81\x01\x09\x00\xF6\x2B\xB6\x7A\x85\x87\x72\x4D"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - stream PEL without consumer} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r restore _stream 0 "\x0F\x01\x10\x00\x00\x01\x7B\x08\xF0\xB2\x34\x00\x00\x00\x00\x00\x00\x00\x00\xC3\x3B\x40\x42\x19\x42\x00\x00\x00\x18\x00\x02\x01\x01\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x20\x10\x00\x00\x20\x01\x00\x01\x20\x03\x02\x05\x01\x03\x20\x05\x40\x00\x04\x82\x5F\x31\x03\x05\x60\x19\x80\x32\x02\x05\x01\xFF\x02\x81\x00\x00\x01\x7B\x08\xF0\xB2\x34\x02\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x7B\x08\xF0\xB2\x34\x01\x01\x00\x00\x01\x7B\x08\xF0\xB2\x34\x00\x00\x00\x00\x00\x00\x00\x01\x35\xB2\xF0\x08\x7B\x01\x00\x00\x01\x01\x13\x41\x6C\x69\x63\x65\x35\xB2\xF0\x08\x7B\x01\x00\x00\x01\x00\x00\x01\x7B\x08\xF0\xB2\x34\x00\x00\x00\x00\x00\x00\x00\x01\x09\x00\x28\x2F\xE0\xC5\x04\xBB\xA7\x31"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - stream listpack valgrind issue} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        r restore _stream 0 "\x0F\x01\x10\x00\x00\x01\x7B\x09\x5E\x94\xFF\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x02\x01\x01\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x05\x01\x03\x01\x25\x01\x00\x01\x01\x01\x82\x5F\x31\x03\x05\x01\x02\x01\x32\x01\x00\x01\x01\x01\x02\x01\xF0\x01\xFF\x02\x81\x00\x00\x01\x7B\x09\x5E\x95\x31\x00\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x7B\x09\x5E\x95\x24\x00\x01\x00\x00\x01\x7B\x09\x5E\x95\x24\x00\x00\x00\x00\x00\x00\x00\x00\x5C\x95\x5E\x09\x7B\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\x4B\x95\x5E\x09\x7B\x01\x00\x00\x01\x00\x00\x01\x7B\x09\x5E\x95\x24\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\x19\x29\x94\xDF\x76\xF8\x1A\xC6"
-        catch {r XINFO STREAM _stream FULL }
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "ASSERTION FAILED"] 1
-    }
-}
-
-test {corrupt payload: fuzzer findings - stream with bad lpFirst} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r restore _stream 0 "\x0F\x01\x10\x00\x00\x01\x7B\x0E\x52\xD2\xEC\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x02\xF7\x01\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x05\x01\x03\x01\x01\x01\x00\x01\x01\x01\x82\x5F\x31\x03\x05\x01\x02\x01\x01\x01\x01\x01\x01\x01\x02\x01\x05\x01\xFF\x02\x81\x00\x00\x01\x7B\x0E\x52\xD2\xED\x01\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x7B\x0E\x52\xD2\xED\x00\x01\x00\x00\x01\x7B\x0E\x52\xD2\xED\x00\x00\x00\x00\x00\x00\x00\x00\xED\xD2\x52\x0E\x7B\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\xED\xD2\x52\x0E\x7B\x01\x00\x00\x01\x00\x00\x01\x7B\x0E\x52\xD2\xED\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\xAC\x05\xC9\x97\x5D\x45\x80\xB3"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - stream listpack lpPrev valgrind issue} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        r restore _stream 0  "\x0F\x01\x10\x00\x00\x01\x7B\x0E\xAE\x66\x36\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x02\x01\x01\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x1D\x01\x03\x01\x24\x01\x00\x01\x01\x69\x82\x5F\x31\x03\x05\x01\x02\x01\x33\x01\x00\x01\x01\x01\x02\x01\x05\x01\xFF\x02\x81\x00\x00\x01\x7B\x0E\xAE\x66\x69\x00\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x7B\x0E\xAE\x66\x5A\x00\x01\x00\x00\x01\x7B\x0E\xAE\x66\x5A\x00\x00\x00\x00\x00\x00\x00\x00\x94\x66\xAE\x0E\x7B\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\x83\x66\xAE\x0E\x7B\x01\x00\x00\x01\x00\x00\x01\x7B\x0E\xAE\x66\x5A\x00\x00\x00\x00\x00\x00\x00\x00\x09\x00\xD5\xD7\xA5\x5C\x63\x1C\x09\x40"
-        catch {r XREVRANGE _stream 1618622681 606195012389}
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "ASSERTION FAILED"] 1
-    }
-}
-
-test {corrupt payload: fuzzer findings - stream with non-integer entry id} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r restore _streambig 0 "\x0F\x03\x10\x00\x00\x01\x7B\x13\x34\xC3\xB2\x00\x00\x00\x00\x00\x00\x00\x00\xC3\x40\x4F\x40\x5C\x18\x5C\x00\x00\x00\x24\x00\x05\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x80\x20\x01\x00\x01\x20\x03\x00\x05\x20\x1C\x40\x09\x05\x01\x01\x82\x5F\x31\x03\x80\x0D\x00\x02\x20\x0D\x00\x02\xA0\x19\x00\x03\x20\x0B\x02\x82\x5F\x33\xA0\x19\x00\x04\x20\x0D\x00\x04\x20\x19\x00\xFF\x10\x00\x00\x01\x7B\x13\x34\xC3\xB2\x00\x00\x00\x00\x00\x00\x00\x05\xC3\x40\x56\x40\x61\x18\x61\x00\x00\x00\x24\x00\x05\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x06\x01\x01\x82\x5F\x35\x03\x05\x20\x1E\x40\x0B\x03\x01\x01\x06\x01\x40\x0B\x03\x01\x01\xDF\xFB\x20\x05\x02\x82\x5F\x37\x60\x1A\x20\x0E\x00\xFC\x20\x05\x00\x08\xC0\x1B\x00\xFD\x20\x0C\x02\x82\x5F\x39\x20\x1B\x00\xFF\x10\x00\x00\x01\x7B\x13\x34\xC3\xB3\x00\x00\x00\x00\x00\x00\x00\x03\xC3\x3D\x40\x4A\x18\x4A\x00\x00\x00\x15\x00\x02\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x40\x00\x00\x05\x60\x07\x02\xDF\xFD\x02\xC0\x23\x09\x01\x01\x86\x75\x6E\x69\x71\x75\x65\x07\xA0\x2D\x02\x08\x01\xFF\x0C\x81\x00\x00\x01\x7B\x13\x34\xC3\xB4\x00\x00\x09\x00\x9D\xBD\xD5\xB9\x33\xC4\xC5\xFF"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - empty quicklist} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {
-            r restore key 0 "\x0E\xC0\x2B\x15\x00\x00\x00\x0A\x00\x00\x00\x01\x00\x00\xE0\x62\x58\xEA\xDF\x22\x00\x00\x00\xFF\x09\x00\xDF\x35\xD2\x67\xDC\x0E\x89\xAB" replace
-        } err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - empty zset} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r restore key 0 "\x05\xC0\x01\x09\x00\xF6\x8A\xB6\x7A\x85\x87\x72\x4D"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - hash with len of 0} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r restore key 0 "\x04\xC0\x21\x09\x00\xF6\x8A\xB6\x7A\x85\x87\x72\x4D"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - hash listpack first element too long entry len} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r debug set-skip-checksum-validation 1
-        r config set sanitize-dump-payload yes
-        catch { r restore _hash 0 "\x10\x15\x15\x00\x00\x00\x06\x00\xF0\x01\x00\x01\x01\x01\x82\x5F\x31\x03\x02\x01\x02\x01\xFF\x0A\x00\x94\x21\x0A\xFA\x06\x52\x9F\x44" replace } err
-        assert_match "*Bad data format*" $err
-        verify_log_message 0 "*integrity check failed*" 0
-    }
-}
-
-test {corrupt payload: fuzzer findings - stream double free listpack when insert dup node to rax returns 0} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r debug set-skip-checksum-validation 1
-        r config set sanitize-dump-payload yes
-        catch { r restore _stream 0 "\x0F\x03\x10\x00\x00\x01\x7B\x60\x5A\x23\x79\x00\x00\x00\x00\x00\x00\x00\x00\xC3\x40\x4F\x40\x5C\x18\x5C\x00\x00\x00\x24\x00\x05\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x00\x01\x20\x03\x00\x05\x20\x1C\x40\x09\x05\x01\x01\x82\x5F\x31\x03\x80\x0D\x00\x02\x20\x0D\x00\x02\xA0\x19\x00\x03\x20\x0B\x02\x82\x5F\x33\xA0\x19\x00\x04\x20\x0D\x00\x04\x20\x19\x00\xFF\x10\x00\x00\x01\x7B\x60\x5A\x23\x79\x00\x00\x00\x00\x00\x00\x00\x05\xC3\x40\x51\x40\x5E\x18\x5E\x00\x00\x00\x24\x00\x05\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x06\x01\x01\x82\x5F\x35\x03\x05\x20\x1E\x40\x0B\x03\x01\x01\x06\x01\x80\x0B\x00\x02\x20\x0B\x02\x82\x5F\x37\xA0\x19\x00\x03\x20\x0D\x00\x08\xA0\x19\x00\x04\x20\x0B\x02\x82\x5F\x39\x20\x19\x00\xFF\x10\x00\x00\x01\x7B\x60\x5A\x23\x79\x00\x00\x00\x00\x00\x00\x00\x00\xC3\x3B\x40\x49\x18\x49\x00\x00\x00\x15\x00\x02\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x40\x00\x00\x05\x20\x07\x40\x09\xC0\x22\x09\x01\x01\x86\x75\x6E\x69\x71\x75\x65\x07\xA0\x2C\x02\x08\x01\xFF\x0C\x81\x00\x00\x01\x7B\x60\x5A\x23\x7A\x01\x00\x0A\x00\x9C\x8F\x1E\xBF\x2E\x05\x59\x09" replace } err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - LCS OOM} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r SETRANGE _int 423324 1450173551
-        catch {r LCS _int _int} err
-        assert_match "*Insufficient memory*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - gcc asan reports false leak on assert} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r debug set-skip-checksum-validation 1
-        r config set sanitize-dump-payload no
-        catch { r restore _list 0 "\x12\x01\x02\x13\x13\x00\x00\x00\x10\x00\x00\x00\x03\x00\x00\xF3\xFE\x02\x5F\x31\x04\xF1\xFF\x0A\x00\x19\x8D\x3D\x74\x85\x94\x29\xBD" }
-        catch { r LPOP _list } err
-        assert_equal [count_log_message 0 "crashed by signal"] 0
-        assert_equal [count_log_message 0 "ASSERTION FAILED"] 1
-    }
-}
-
-test {corrupt payload: fuzzer findings - lpFind invalid access} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r debug set-skip-checksum-validation 1
-        r config set sanitize-dump-payload no
-         r restore _hashbig 0 "\x10\x39\x39\x00\x00\x00\x14\x00\x06\x01\x06\x01\x03\x01\x82\x5F\x33\x03\x07\x01\x82\x5F\x37\x03\x00\x01\x00\x01\x04\x01\x04\x01\x09\x01\x82\x5F\x39\x03\x05\x01\x82\x5F\x35\x03\x08\x01\x08\x01\x01\x01\x82\x5F\x31\x03\x02\x01\xF0\x01\xFF\x0A\x00\x29\xD7\xE4\x52\x79\x7A\x95\x82"
-         catch { r HLEN _hashbig }
-         catch { r HSETNX _hashbig 513072881620 "\x9A\x4B\x1F\xF2\x99\x74\x6E\x96\x84\x7F\xB9\x85\xBE\xD6\x1A\x93\x0A\xED\xAE\x19\xA0\x5A\x67\xD6\x89\xA8\xF9\xF2\xB8\xBD\x3E\x5A\xCF\xD2\x5B\x17\xA4\xBB\xB2\xA9\x56\x67\x6E\x0B\xED\xCD\x36\x49\xC6\x84\xFF\xC2\x76\x9B\xF3\x49\x88\x97\x92\xD2\x54\xE9\x08\x19\x86\x40\x96\x24\x68\x25\x9D\xF7\x0E\xB7\x36\x85\x68\x6B\x2A\x97\x64\x30\xE6\xFF\x9A\x2A\x42\x2B\x31\x01\x32\xB3\xEE\x78\x1A\x26\x94\xE2\x07\x34\x50\x8A\xFF\xF9\xAE\xEA\xEC\x59\x42\xF5\x39\x40\x65\xDE\x55\xCC\x77\x1B\x32\x02\x19\xEE\x3C\xD4\x79\x48\x01\x4F\x51\xFE\x22\xE0\x0C\xF4\x07\x06\xCD\x55\x30\xC0\x24\x32\xD4\xCC\xAF\x82\x05\x48\x14\x10\x55\xA1\x3D\xF6\x81\x45\x54\xEA\x71\x24\x27\x06\xDC\xFA\xE4\xE4\x87\xCC\x81\xA0\x47\xA5\xAF\xD1\x89\xE7\x42\xC3\x24\xD0\x32\x7A\xDE\x44\x47\x6E\x1F\xCB\xEE\xA6\x46\xDE\x0D\xE6\xD5\x16\x03\x2A\xD6\x9E\xFD\x94\x02\x2C\xDB\x1F\xD0\xBE\x98\x10\xE3\xEB\xEA\xBE\xE5\xD1" }
-    }
-}
-
-test {corrupt payload: fuzzer findings - invalid access in ziplist tail prevlen decoding} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r debug set-skip-checksum-validation 1
-        r config set sanitize-dump-payload no
-        catch {r restore _listbig 0 "\x0e\x02\x1B\x1B\x00\x00\x00\x16\x00\x00\x00\x05\x00\x00\x02\x5F\x39\x04\xF9\x02\x02\x5F\x37\x04\xF7\x02\x02\x5F\x35\xFF\x19\x19\x00\x00\x00\x16\x00\x00\x00\x05\x00\x00\xF5\x02\x02\x5F\x33\x04\xF3\x02\x02\x5F\x31\xFE\xF1\xFF\x0A\x00\x6B\x43\x32\x2F\xBB\x29\x0a\xBE"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - zset zslInsert with a NAN score} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {r restore _nan_zset 0 "\x05\x0A\x02\x5F\x39\x00\x00\x00\x00\x00\x00\x22\x40\xC0\x08\x00\x00\x00\x00\x00\x00\x20\x40\x02\x5F\x37\x00\x00\x00\x00\x00\x00\x1C\x40\xC0\x06\x00\x00\x00\x00\x00\x00\x18\x40\x02\x5F\x35\x00\x00\x00\x00\x00\x00\x14\x40\xC0\x04\x00\x00\x00\x00\x00\x00\x10\x40\x02\x5F\x33\x00\x00\x00\x00\x00\x00\x08\x40\xC0\x02\x00\x00\x00\x00\x00\x00\x00\x40\x02\x5F\x31\x00\x00\x00\x00\x00\x55\xF0\x7F\xC0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0A\x00\xEC\x94\x86\xD8\xFD\x5C\x5F\xD8"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - streamLastValidID panic} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r restore _streambig 0 "\x13\xC0\x10\x00\x00\x01\x80\x20\x48\xA0\x33\x00\x00\x00\x00\x00\x00\x00\x00\xC3\x40\x4F\x40\x5C\x18\x5C\x00\x00\x00\x24\x00\x05\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x00\x01\x20\x03\x00\x05\x20\x1C\x40\x09\x05\x01\x01\x82\x5F\x31\x03\x80\x0D\x00\x02\x20\x0D\x00\x02\xA0\x19\x00\x03\x20\x0B\x02\x82\x5F\x33\x60\x19\x40\x2F\x02\x01\x01\x04\x20\x19\x00\xFF\x10\x00\x00\x01\x80\x20\x48\xA0\x34\x00\x00\x00\x00\x00\x00\x00\x01\xC3\x40\x51\x40\x5E\x18\x5E\x00\x00\x00\x24\x00\x05\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x06\x01\x01\x82\x5F\x35\x03\x05\x20\x1E\x40\x0B\x03\x01\x01\x06\x01\x80\x0B\x00\x02\x20\x0B\x02\x82\x5F\x37\xA0\x19\x00\x03\x20\x0D\x00\x08\xA0\x19\x00\x04\x20\x0B\x02\x82\x5F\x39\x20\x19\x00\xFF\x10\x00\x00\x01\x80\x20\x48\xA0\x34\x00\x00\x00\x00\x00\x00\x00\x06\xC3\x3D\x40\x4A\x18\x4A\x00\x00\x00\x15\x00\x02\x01\x00\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x40\x10\x00\x00\x20\x01\x40\x00\x00\x05\x60\x07\x02\xDF\xFA\x02\xC0\x23\x09\x01\x01\x86\x75\x6E\x69\x71\x75\x65\x07\xA0\x2D\x02\x08\x01\xFF\x0C\x81\x00\x00\x01\x80\x20\x48\xA0\x35\x00\x81\x00\x00\x01\x80\x20\x48\xA0\x33\x00\x00\x00\x0C\x00\x0A\x00\x34\x8B\x0E\x5B\x42\xCD\xD6\x08"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - valgrind fishy value warning} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r restore _key 0 "\x13\x01\x10\x00\x00\x01\x81\xCC\x07\xDC\xF2\x00\x00\x00\x00\x00\x00\x00\x00\x40\x42\x42\x00\x00\x00\x18\x00\x02\x01\x01\x01\x02\x01\x84\x69\x74\x65\x6D\x05\x85\x76\x61\x6C\x75\x65\x06\x00\x01\x02\x01\x00\x01\x00\x01\x01\x01\x00\x01\x05\x01\x03\x01\x2C\x01\x00\x01\x01\x01\x82\x5F\x31\x03\x05\x01\x02\x01\x3C\x01\x00\x01\x01\x01\x02\x01\x05\x01\xFF\x02\xD0\x00\x00\x01\x81\xCC\x07\xDD\x2E\x00\x81\x00\x00\x01\x81\xCC\x07\xDC\xF2\x00\x81\x00\x00\x01\x81\xCC\x07\xDD\x1E\x00\x03\x01\x07\x6D\x79\x67\x72\x6F\x75\x70\x81\x00\x00\x01\x81\xCC\x07\xDD\x1E\x00\x02\x01\x00\x00\x01\x81\xCC\x07\xDD\x1E\x00\x00\x00\x00\x00\x00\x00\x00\x71\xDD\x07\xCC\x81\x01\x00\x00\x01\x01\x05\x41\x6C\x69\x63\x65\x58\xDD\x07\xCC\x81\x01\x00\x00\x01\x00\x00\x01\x81\xCC\x07\xDD\x1E\x00\x00\x00\x00\x00\x00\x00\x00\x0A\x00\x2F\xB0\xD1\x15\x0A\x97\x87\x6B"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - empty set listpack} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload no
-        r debug set-skip-checksum-validation 1
-        catch {r restore _key 0 "\x14\x25\x25\x00\x00\x00\x00\x00\x02\x01\x82\x5F\x37\x03\x06\x01\x82\x5F\x35\x03\x82\x5F\x33\x03\x00\x01\x82\x5F\x31\x03\x82\x5F\x39\x03\x04\xA9\x08\x01\xFF\x0B\x00\xA3\x26\x49\xB4\x86\xB0\x0F\x41"} err
-        assert_match "*Bad data format*" $err
-        r ping
-    }
-}
-
-test {corrupt payload: fuzzer findings - set with duplicate elements causes sdiff to hang} {
-    start_server [list overrides [list loglevel verbose use-exit-on-panic yes crash-memcheck-enabled no] ] {
-        r config set sanitize-dump-payload yes
-        r debug set-skip-checksum-validation 1
-        catch {r restore _key 0 "\x14\x25\x25\x00\x00\x00\x0A\x00\x06\x01\x82\x5F\x35\x03\x04\x01\x82\x5F\x31\x03\x82\x5F\x33\x03\x00\x01\x82\x5F\x39\x03\x82\x5F\x33\x03\x08\x01\x02\x01\xFF\x0B\x00\x31\xBE\x7D\x41\x01\x03\x5B\xEC" replace} err
-        assert_match "*Bad data format*" $err
-        r ping
-
-        # In the past, it generated a broken protocol and left the client hung in sdiff
-        r config set sanitize-dump-payload no
-        assert_equal {OK} [r restore _key 0 "\x14\x25\x25\x00\x00\x00\x0A\x00\x06\x01\x82\x5F\x35\x03\x04\x01\x82\x5F\x31\x03\x82\x5F\x33\x03\x00\x01\x82\x5F\x39\x03\x82\x5F\x33\x03\x08\x01\x02\x01\xFF\x0B\x00\x31\xBE\x7D\x41\x01\x03\x5B\xEC" replace]
-        assert_type set _key
-        assert_encoding listpack _key
-        assert_equal 10 [r scard _key]
-        assert_equal {0 2 4 6 8 _1 _3 _3 _5 _9} [lsort [r smembers _key]]
-        assert_equal {0 2 4 6 8 _1 _3 _5 _9} [lsort [r sdiff _key]]
-    }
-} {} {logreqres:skip} ;# This test violates {"uniqueItems": true}
-
-} ;# tags
-
diff --git a/tests/integration/rdb.tcl b/tests/integration/rdb.tcl
index 61cb0cea7e..f8ed014014 100644
--- a/tests/integration/rdb.tcl
+++ b/tests/integration/rdb.tcl
@@ -51,35 +51,6 @@ start_server [list overrides [list "dir" $server_path] keep_persistence true] {
     } {0000000000000000000000000000000000000000}
 }
 
-start_server [list overrides [list "dir" $server_path] keep_persistence true] {
-    test {Test RDB stream encoding} {
-        for {set j 0} {$j < 1000} {incr j} {
-            if {rand() < 0.9} {
-                r xadd stream * foo abc
-            } else {
-                r xadd stream * bar $j
-            }
-        }
-        r xgroup create stream mygroup 0
-        set records [r xreadgroup GROUP mygroup Alice COUNT 2 STREAMS stream >]
-        r xdel stream [lindex [lindex [lindex [lindex $records 0] 1] 1] 0]
-        r xack stream mygroup [lindex [lindex [lindex [lindex $records 0] 1] 0] 0]
-        set digest [debug_digest]
-        r config set sanitize-dump-payload no
-        r debug reload
-        set newdigest [debug_digest]
-        assert {$digest eq $newdigest}
-    }
-    test {Test RDB stream encoding - sanitize dump} {
-        r config set sanitize-dump-payload yes
-        r debug reload
-        set newdigest [debug_digest]
-        assert {$digest eq $newdigest}
-    }
-    # delete the stream, maybe valgrind will find something
-    r del stream
-}
-
 # Helper function to start a server and kill it, just to check the error
 # logged.
 set defaults {}
diff --git a/tests/unit/type/hash.tcl b/tests/unit/type/hash.tcl
index bd3f2cd0c0..ac61ef644d 100644
--- a/tests/unit/type/hash.tcl
+++ b/tests/unit/type/hash.tcl
@@ -803,62 +803,4 @@ start_server {tags {"hash"}} {
             assert {[r hincrbyfloat myhash float -0.1] eq {1.9}}
         }
     }
-
-    test {Hash ziplist of various encodings} {
-        r del k
-        config_set hash-max-ziplist-entries 1000000000
-        config_set hash-max-ziplist-value 1000000000
-        r hset k ZIP_INT_8B 127
-        r hset k ZIP_INT_16B 32767
-        r hset k ZIP_INT_32B 2147483647
-        r hset k ZIP_INT_64B 9223372036854775808
-        r hset k ZIP_INT_IMM_MIN 0
-        r hset k ZIP_INT_IMM_MAX 12
-        r hset k ZIP_STR_06B [string repeat x 31]
-        r hset k ZIP_STR_14B [string repeat x 8191]
-        r hset k ZIP_STR_32B [string repeat x 65535]
-        set k [r hgetall k]
-        set dump [r dump k]
-
-        # will be converted to dict at RESTORE
-        config_set hash-max-ziplist-entries 2
-        config_set sanitize-dump-payload no mayfail
-        r restore kk 0 $dump
-        set kk [r hgetall kk]
-
-        # make sure the values are right
-        assert_equal [lsort $k] [lsort $kk]
-        assert_equal [dict get $k ZIP_STR_06B] [string repeat x 31]
-        set k [dict remove $k ZIP_STR_06B]
-        assert_equal [dict get $k ZIP_STR_14B] [string repeat x 8191]
-        set k [dict remove $k ZIP_STR_14B]
-        assert_equal [dict get $k ZIP_STR_32B] [string repeat x 65535]
-        set k [dict remove $k ZIP_STR_32B]
-        set _ $k
-    } {ZIP_INT_8B 127 ZIP_INT_16B 32767 ZIP_INT_32B 2147483647 ZIP_INT_64B 9223372036854775808 ZIP_INT_IMM_MIN 0 ZIP_INT_IMM_MAX 12}
-
-    test {Hash ziplist of various encodings - sanitize dump} {
-        config_set sanitize-dump-payload yes mayfail
-        r restore kk 0 $dump replace
-        set k [r hgetall k]
-        set kk [r hgetall kk]
-
-        # make sure the values are right
-        assert_equal [lsort $k] [lsort $kk]
-        assert_equal [dict get $k ZIP_STR_06B] [string repeat x 31]
-        set k [dict remove $k ZIP_STR_06B]
-        assert_equal [dict get $k ZIP_STR_14B] [string repeat x 8191]
-        set k [dict remove $k ZIP_STR_14B]
-        assert_equal [dict get $k ZIP_STR_32B] [string repeat x 65535]
-        set k [dict remove $k ZIP_STR_32B]
-        set _ $k
-    } {ZIP_INT_8B 127 ZIP_INT_16B 32767 ZIP_INT_32B 2147483647 ZIP_INT_64B 9223372036854775808 ZIP_INT_IMM_MIN 0 ZIP_INT_IMM_MAX 12}
-
-    # On some platforms strtold("+inf") with valgrind returns a non-inf result
-    if {!$::valgrind} {
-        test {HINCRBYFLOAT does not allow NaN or Infinity} {
-            assert_error "*value is NaN or Infinity*" {r hincrbyfloat hfoo field +inf}
-            assert_equal 0 [r exists hfoo]
-        }
-    }
 }
diff --git a/tests/unit/type/list.tcl b/tests/unit/type/list.tcl
index 83a93bffbf..3f69c25ed9 100644
--- a/tests/unit/type/list.tcl
+++ b/tests/unit/type/list.tcl
@@ -2214,59 +2214,6 @@ foreach {pop} {BLPOP BLMPOP_RIGHT} {
         assert_encoding quicklist lst
     }
 
-    test "List of various encodings" {
-        r del k
-        r lpush k 127 ;# ZIP_INT_8B
-        r lpush k 32767 ;# ZIP_INT_16B
-        r lpush k 2147483647 ;# ZIP_INT_32B
-        r lpush k 9223372036854775808 ;# ZIP_INT_64B
-        r lpush k 0 ;# ZIP_INT_IMM_MIN
-        r lpush k 12 ;# ZIP_INT_IMM_MAX
-        r lpush k [string repeat x 31] ;# ZIP_STR_06B
-        r lpush k [string repeat x 8191] ;# ZIP_STR_14B
-        r lpush k [string repeat x 65535] ;# ZIP_STR_32B
-        assert_encoding quicklist k ;# exceeds the size limit of quicklist node
-        set k [r lrange k 0 -1]
-        set dump [r dump k]
-
-        # coverage for objectComputeSize
-        assert_morethan [memory_usage k] 0
-
-        config_set sanitize-dump-payload no mayfail
-        r restore kk 0 $dump replace
-        assert_encoding quicklist kk
-        set kk [r lrange kk 0 -1]
-
-        # try some forward and backward searches to make sure all encodings
-        # can be traversed
-        assert_equal [r lindex kk 5] {9223372036854775808}
-        assert_equal [r lindex kk -5] {0}
-        assert_equal [r lpos kk foo rank 1] {}
-        assert_equal [r lpos kk foo rank -1] {}
-
-        # make sure the values are right
-        assert_equal $k $kk
-        assert_equal [lpop k] [string repeat x 65535]
-        assert_equal [lpop k] [string repeat x 8191]
-        assert_equal [lpop k] [string repeat x 31]
-        set _ $k
-    } {12 0 9223372036854775808 2147483647 32767 127}
-
-    test "List of various encodings - sanitize dump" {
-        config_set sanitize-dump-payload yes mayfail
-        r restore kk 0 $dump replace
-        assert_encoding quicklist kk
-        set k [r lrange k 0 -1]
-        set kk [r lrange kk 0 -1]
-
-        # make sure the values are right
-        assert_equal $k $kk
-        assert_equal [lpop k] [string repeat x 65535]
-        assert_equal [lpop k] [string repeat x 8191]
-        assert_equal [lpop k] [string repeat x 31]
-        set _ $k
-    } {12 0 9223372036854775808 2147483647 32767 127}
-    
     test "Unblock fairness is kept while pipelining" {
         set rd1 [valkey_deferring_client]
         set rd2 [valkey_deferring_client]