#1259 - Update code in ext/ directory

zephir-lang · Apr 24, 2021 · 87d85a9 · 87d85a9
1 parent ffc3d78
commit 87d85a9
Show file tree

Hide file tree

Showing 8 changed files with 220 additions and 20 deletions.
diff --git a/ext/kernel/array.c b/ext/kernel/array.c
@@ -364,7 +364,7 @@ int ZEPHIR_FASTCALL zephir_array_unset(zval *arr, zval *index, int flags)
 			return (zend_symtable_del(ht, Z_STR_P(index)) == SUCCESS);
 
 		default:
-			zend_error(E_WARNING, "Illegal offset type");
+			zend_error(E_WARNING, "Passed index has illegal offset type (check zephir_array_unset())");
 			return 0;
 	}
 }
@@ -387,7 +387,7 @@ int ZEPHIR_FASTCALL zephir_array_unset_string(zval *arr, const char *index, uint
 	}
 
 	if ((flags & PH_SEPARATE) == PH_SEPARATE) {
-		SEPARATE_ARRAY(arr);
+		SEPARATE_ZVAL(arr);
 	}
 
 	return zend_hash_str_del(Z_ARRVAL_P(arr), index, index_length);

diff --git a/ext/kernel/concat.c b/ext/kernel/concat.c
@@ -628,7 +628,7 @@ void zephir_concat_vvv(zval *result, zval *op1, zval *op2, zval *op3, int self_v
 void zephir_concat_function(zval *result, zval *op1, zval *op2)
 {
 	zval tmp;
-	SEPARATE_ZVAL(result);
+	SEPARATE_ZVAL_NOREF(result);
 
 	/*
 		res == op1 == op2: won't leak

diff --git a/ext/stub/arrayaccessobj.zep.c b/ext/stub/arrayaccessobj.zep.c
diff --git a/ext/stub/arrayaccesstest.zep.c b/ext/stub/arrayaccesstest.zep.c
diff --git a/ext/stub/arrayaccesstest.zep.h b/ext/stub/arrayaccesstest.zep.h
diff --git a/ext/stub/assign.zep.c b/ext/stub/assign.zep.c
diff --git a/ext/stub/assign.zep.h b/ext/stub/assign.zep.h