diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-23 13:18:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-23 13:18:59 +0200 |
| commit | c2add43bbc8a278b4f306847dbd9b3f222237d32 (patch) | |
| tree | dd30d5d7eb28d00deb92aca3d56a1ecaa318279a /ext/spl | |
| parent | 3f0cab53b2841b4d64a2f9aeec441b775cd0190e (diff) | |
| parent | f53af9ac2396f82fb9f69e668fbab7085de2f5b8 (diff) | |
| download | php-git-c2add43bbc8a278b4f306847dbd9b3f222237d32.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'ext/spl')
| -rw-r--r-- | ext/spl/spl_observer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index 5b1e2cfe7e..ba29e0311e 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -783,6 +783,9 @@ SPL_METHOD(SplObjectStorage, unserialize) --p; /* for ';' */ count = Z_LVAL_P(pcount); + if (count < 0) { + goto outexcept; + } ZVAL_UNDEF(&entry); ZVAL_UNDEF(&inf); |