Fix invalid allocation size

yatsukhnenko · yatsukhnenko · commit cf2c052c7b5d · 2022-06-28T23:11:37.000+03:00
diff --git a/library.c b/library.c
@@ -1195,12 +1195,14 @@ redis_parse_client_list_response(char *response, zval *z_ret)
 {
     char *p1, *s1 = NULL;
 
+    ZVAL_FALSE(z_ret);
     if ((p1 = php_strtok_r(response, _NL, &s1)) != NULL) {
         array_init(z_ret);
         do {
             char *p2, *s2 = NULL;
             zval z_sub;
 
+            ZVAL_FALSE(&z_sub);
             if ((p2 = php_strtok_r(p1, " ", &s2)) != NULL) {
                 array_init(&z_sub);
                 do {
@@ -1218,19 +1220,15 @@ redis_parse_client_list_response(char *response, zval *z_ret)
                             add_assoc_double_ex(&z_sub, p2, p - p2, dval);
                             break;
                         default:
-                            add_assoc_stringl_ex(&z_sub, p2, p - p2, p + 1, s2 - p - 2);
+                            add_assoc_string_ex(&z_sub, p2, p - p2, p + 1);
                         }
                     } else {
                         add_next_index_string(&z_sub, p2);
                     }
                 } while ((p2 = php_strtok_r(NULL, " ", &s2)) != NULL);
-            } else {
-                ZVAL_FALSE(&z_sub);
             }
             add_next_index_zval(z_ret, &z_sub);
         } while ((p1 = php_strtok_r(NULL, _NL, &s1)) != NULL);
-    } else {
-        ZVAL_FALSE(z_ret);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1195,12 +1195,14 @@ redis_parse_client_list_response(char response, zval z_ret)`
`1195`	`1195`	`{`
`1196`	`1196`	`char p1, s1 = NULL;`
`1197`	`1197`
	`1198`	`+ ZVAL_FALSE(z_ret);`
`1198`	`1199`	`if ((p1 = php_strtok_r(response, _NL, &s1)) != NULL) {`
`1199`	`1200`	`array_init(z_ret);`
`1200`	`1201`	`do {`
`1201`	`1202`	`char p2, s2 = NULL;`
`1202`	`1203`	`zval z_sub;`
`1203`	`1204`
	`1205`	`+ ZVAL_FALSE(&z_sub);`
`1204`	`1206`	`if ((p2 = php_strtok_r(p1, " ", &s2)) != NULL) {`
`1205`	`1207`	`array_init(&z_sub);`
`1206`	`1208`	`do {`
`@@ -1218,19 +1220,15 @@ redis_parse_client_list_response(char response, zval z_ret)`
`1218`	`1220`	`add_assoc_double_ex(&z_sub, p2, p - p2, dval);`
`1219`	`1221`	`break;`
`1220`	`1222`	`default:`
`1221`		`- add_assoc_stringl_ex(&z_sub, p2, p - p2, p + 1, s2 - p - 2);`
	`1223`	`+ add_assoc_string_ex(&z_sub, p2, p - p2, p + 1);`
`1222`	`1224`	`}`
`1223`	`1225`	`} else {`
`1224`	`1226`	`add_next_index_string(&z_sub, p2);`
`1225`	`1227`	`}`
`1226`	`1228`	`} while ((p2 = php_strtok_r(NULL, " ", &s2)) != NULL);`
`1227`		`- } else {`
`1228`		`- ZVAL_FALSE(&z_sub);`
`1229`	`1229`	`}`
`1230`	`1230`	`add_next_index_zval(z_ret, &z_sub);`
`1231`	`1231`	`} while ((p1 = php_strtok_r(NULL, _NL, &s1)) != NULL);`
`1232`		`- } else {`
`1233`		`- ZVAL_FALSE(z_ret);`
`1234`	`1232`	`}`
`1235`	`1233`	`}`
`1236`	`1234`