Skip to content

Commit ad470a9

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Set SG(rfc1867_uploaded_files) to null after destroy
2 parents ccdd1c4 + c47d357 commit ad470a9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

main/rfc1867.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ PHPAPI void destroy_uploaded_files_hash(void) /* {{{ */
174174
} ZEND_HASH_FOREACH_END();
175175
zend_hash_destroy(SG(rfc1867_uploaded_files));
176176
FREE_HASHTABLE(SG(rfc1867_uploaded_files));
177+
SG(rfc1867_uploaded_files) = NULL;
177178
}
178179
/* }}} */
179180

@@ -1134,7 +1135,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
11341135
register_http_post_files_variable(lbuf, s, &PG(http_globals)[TRACK_VARS_FILES], 0);
11351136
s = NULL;
11361137

1137-
/* Add full path of supplied file for folder uploads via
1138+
/* Add full path of supplied file for folder uploads via
11381139
* <input type="file" name="files" multiple webkitdirectory>
11391140
*/
11401141
/* Add $foo[full_path] */

0 commit comments

Comments
 (0)