diff options
| author | Stanislav Malyshev <stas@php.net> | 2020-01-20 22:22:02 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2020-01-20 22:46:29 -0800 |
| commit | 25ec7eb3463f34a2be666c6785d1c6b3cc89575e (patch) | |
| tree | fa292e6176eae262eac6dac4a91005e0f318765e /ext/session/session.c | |
| parent | 07bda97e765407bac9c37c9d4feb6aebb23434bd (diff) | |
| parent | 5c90f8eb66cc8ad0e9377dcf46ad2252924dfb29 (diff) | |
| download | php-git-25ec7eb3463f34a2be666c6785d1c6b3cc89575e.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fix bug #79037 (global buffer-overflow in `mbfl_filt_conv_big5_wchar`)
Fix #79099: OOB read in php_strip_tags_ex
Fix #79091: heap use-after-free in session_create_id()
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 1364d16c8a..d0779294ec 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -2287,6 +2287,7 @@ static PHP_FUNCTION(session_create_id) /* Detect collision and retry */ if (PS(mod)->s_validate_sid(&PS(mod_data), new_id) == FAILURE) { zend_string_release_ex(new_id, 0); + new_id = NULL; continue; } break; |