Also set error for hGetAll and lower error len by 1

michael-grunder · michael-grunder · commit 3a622a07ba6a · 2019-10-05T15:57:27.000-07:00
diff --git a/library.c b/library.c
@@ -1211,6 +1211,9 @@ redis_mbulk_reply_zipped(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
         } else {
             add_next_index_bool(z_tab, 0);
         }
+        if (*inbuf == TYPE_ERR) {
+            redis_sock_set_err(redis_sock, inbuf + 1, len - 1);
+        }
         return -1;
     }
     numElems = atoi(inbuf+1);
@@ -2122,7 +2125,7 @@ PHP_REDIS_API int redis_mbulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSoc
             add_next_index_bool(z_tab, 0);
         }
         if (*inbuf == TYPE_ERR) {
-            redis_sock_set_err(redis_sock, inbuf + 1, len);
+            redis_sock_set_err(redis_sock, inbuf + 1, len - 1);
         }
         goto failure;
     }

Original file line number	Diff line number	Diff line change
`@@ -1211,6 +1211,9 @@ redis_mbulk_reply_zipped(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,`
`1211`	`1211`	`} else {`
`1212`	`1212`	`add_next_index_bool(z_tab, 0);`
`1213`	`1213`	`}`
	`1214`	`+ if (*inbuf == TYPE_ERR) {`
	`1215`	`+ redis_sock_set_err(redis_sock, inbuf + 1, len - 1);`
	`1216`	`+ }`
`1214`	`1217`	`return -1;`
`1215`	`1218`	`}`
`1216`	`1219`	`numElems = atoi(inbuf+1);`
`@@ -2122,7 +2125,7 @@ PHP_REDIS_API int redis_mbulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSoc`
`2122`	`2125`	`add_next_index_bool(z_tab, 0);`
`2123`	`2126`	`}`
`2124`	`2127`	`if (*inbuf == TYPE_ERR) {`
`2125`		`- redis_sock_set_err(redis_sock, inbuf + 1, len);`
	`2128`	`+ redis_sock_set_err(redis_sock, inbuf + 1, len - 1);`
`2126`	`2129`	`}`
`2127`	`2130`	`goto failure;`
`2128`	`2131`	`}`