Fix issue sibaz#4 - match array not initialized

Done like in function php_pcre_match_impl() of PCRE module.
lachbaer · Feb 28, 2023 · cc2e72e · cc2e72e
1 parent 9d83d26
commit cc2e72e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/expect.c b/expect.c
@@ -452,11 +452,15 @@ PHP_FUNCTION(expect_expectl)
 		if (z_match && exp_match && exp_match_len > 0) {
 			char *tmp = (char *)emalloc (sizeof(char) * (exp_match_len + 1));
 			strlcpy (tmp, exp_match, exp_match_len + 1);
-			zval_dtor (z_match);
-			array_init(z_match);
 #if PHP_MAJOR_VERSION >= 7
+            z_match = zend_try_array_init(z_match);
+			if (!z_match) {
+				return;
+			}
             add_index_string(z_match, 0, tmp);
 #else
+			zval_dtor (z_match);
+			array_init(z_match);
 			add_index_string(z_match, 0, tmp, 1);
 #endif
 			/* Get case that was matched */