Skip to content

Commit d10ff9b

Browse files
committed
Remove incorrect call to zval_ptr_dtor() in user_wrapper_metadata()
This one is not initialized. This is not hittable from userspace code because all locations within first-party php-src code have a valid `option` argument. Closes phpGH-19714.
1 parent bd88a54 commit d10ff9b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ PHP NEWS
3636
- Standard:
3737
. Fixed bug GH-16649 (UAF during array_splice). (alexandre-daubois)
3838

39+
- Streams:
40+
. Remove incorrect call to zval_ptr_dtor() in user_wrapper_metadata().
41+
(nielsdos)
42+
3943
- Tidy:
4044
. Fixed GH-19021 build issue with libtidy in regard of tidyOptIsReadonly
4145
deprecation and TidyInternalCategory being available later than

main/streams/userspace.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,6 @@ static int user_wrapper_metadata(php_stream_wrapper *wrapper, const char *url, i
12231223
break;
12241224
default:
12251225
php_error_docref(NULL, E_WARNING, "Unknown option %d for " USERSTREAM_METADATA, option);
1226-
zval_ptr_dtor(&args[2]);
12271226
return ret;
12281227
}
12291228

0 commit comments

Comments
 (0)