Skip to content

Commit 5a2ca7e

Browse files
ASAN
1 parent 1e07b70 commit 5a2ca7e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

ext/filter/filter.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -550,17 +550,18 @@ static void php_filter_call(
550550
return;
551551
}
552552
if (filter_flags & FILTER_REQUIRE_ARRAY) {
553-
const char *got_type = zend_zval_value_name(filtered);
554-
zval_ptr_dtor(filtered);
555553
if (filter_flags & FILTER_THROW_ON_FAILURE) {
556-
ZVAL_NULL(filtered);
557554
zend_throw_exception_ex(
558555
php_filter_failed_exception_ce,
559556
0,
560557
"filter validation failed: not an array (got %s)",
561-
got_type
558+
zend_zval_value_name(filtered)
562559
);
563-
} else if (filter_flags & FILTER_NULL_ON_FAILURE) {
560+
zval_ptr_dtor(filtered);
561+
return;
562+
}
563+
zval_ptr_dtor(filtered);
564+
if (filter_flags & FILTER_NULL_ON_FAILURE) {
564565
ZVAL_NULL(filtered);
565566
} else {
566567
ZVAL_FALSE(filtered);

0 commit comments

Comments
 (0)