caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix stream sanitization for non-int first value (#9553)

Browse Source 
This was recently broken in #9321 when we validated stream IDs to be
integers but did that after to the stepping next record instead of before.
This commit is contained in:
Oran Agra 2021-09-26 18:46:22 +03:00 committed by GitHub
parent 6600253046
commit 5a4ab7c7d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/t_stream.c
View File

@ -3603,12 +3603,12 @@ int streamValidateListpackIntegrity(unsigned char *lp, size_t size, int deep) {
p = next; if (!lpValidateNext(lp, &next, size)) return 0; p = next; if (!lpValidateNext(lp, &next, size)) return 0;
/* entry id */ /* entry id */
p = next; if (!lpValidateNext(lp, &next, size)) return 0;
lpGetIntegerIfValid(p, &valid_record); lpGetIntegerIfValid(p, &valid_record);
if (!valid_record) return 0; if (!valid_record) return 0;
p = next; if (!lpValidateNext(lp, &next, size)) return 0; p = next; if (!lpValidateNext(lp, &next, size)) return 0;
lpGetIntegerIfValid(p, &valid_record); lpGetIntegerIfValid(p, &valid_record);
if (!valid_record) return 0; if (!valid_record) return 0;
p = next; if (!lpValidateNext(lp, &next, size)) return 0;
if (!(flags & STREAM_ITEM_FLAG_SAMEFIELDS)) { if (!(flags & STREAM_ITEM_FLAG_SAMEFIELDS)) {
/* num-of-fields */ /* num-of-fields */

2
tests/integration/rdb.tcl
View File

@ -45,7 +45,7 @@ start_server [list overrides [list "dir" $server_path] keep_persistence true] {
test {Test RDB stream encoding} { test {Test RDB stream encoding} {
for {set j 0} {$j < 1000} {incr j} { for {set j 0} {$j < 1000} {incr j} {
if {rand() < 0.9} { if {rand() < 0.9} {
r xadd stream * foo $j r xadd stream * foo abc
} else { } else {
r xadd stream * bar $j r xadd stream * bar $j
} }