Not all versions contain the trailing NULL byte, so do not require it

mcuelenaere · mcuelenaere · commit 5528297a3e72 · 2016-03-16T10:19:23.000+01:00
diff --git a/library.c b/library.c
@@ -2159,16 +2159,19 @@ redis_unserialize(RedisSock* redis_sock, const char *val, int val_len,
             /*
              * Check if the given string starts with an igbinary header.
              *
-             * An igbinary string consists of the following format:
+             * A modern igbinary string consists of the following format:
              *
              * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
              * | header (4) | type (1) | ... (n) |  NUL (1) |
              * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
              *
              * With header being either 0x00000001 or 0x00000002
              * (encoded as big endian).
+             *
+             * Not all versions contain the trailing NULL byte though, so
+             * do not check for that.
              */
-            if (val_len < 6
+            if (val_len < 5
                     || (memcmp(val, "\x00\x00\x00\x01", 4) != 0
                     && memcmp(val, "\x00\x00\x00\x02", 4) != 0))
             {

Original file line number	Diff line number	Diff line change
`@@ -2159,16 +2159,19 @@ redis_unserialize(RedisSock* redis_sock, const char *val, int val_len,`
`2159`	`2159`	`/*`
`2160`	`2160`	`* Check if the given string starts with an igbinary header.`
`2161`	`2161`	`*`
`2162`		`- * An igbinary string consists of the following format:`
	`2162`	`+ * A modern igbinary string consists of the following format:`
`2163`	`2163`	`*`
`2164`	`2164`	`* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-`
`2165`	`2165`	`* \| header (4) \| type (1) \| ... (n) \| NUL (1) \|`
`2166`	`2166`	`* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-`
`2167`	`2167`	`*`
`2168`	`2168`	`* With header being either 0x00000001 or 0x00000002`
`2169`	`2169`	`* (encoded as big endian).`
	`2170`	`+ *`
	`2171`	`+ * Not all versions contain the trailing NULL byte though, so`
	`2172`	`+ * do not check for that.`
`2170`	`2173`	`*/`
`2171`		`- if (val_len < 6`
	`2174`	`+ if (val_len < 5`
`2172`	`2175`	`\|\| (memcmp(val, "\x00\x00\x00\x01", 4) != 0`
`2173`	`2176`	`&& memcmp(val, "\x00\x00\x00\x02", 4) != 0))`
`2174`	`2177`	`{`