diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-08-15 08:10:08 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-08-15 08:10:08 +0400 |
| commit | 8b66d64b2343bc4fd8aeabb690024edb850a0155 (patch) | |
| tree | bd64ff35b4d598dc7e0252347ef538709fe2c333 | |
| parent | 6463bc5b55f6c771d5253cbc877725b5f5cec23a (diff) | |
| parent | e9dac4cf71af3af131e75bf57aba1635f10ba82e (diff) | |
| download | php-git-POST_PHPNG_MERGE.tar.gz | |
Merge branch 'master' into phpngPOST_PHPNG_MERGE
* master:
add NEWS for 5.6 too
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
fix test
split the glob() test to test different basedir
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358, glob returns error, should be empty array()
Add NEWS entry for log() improvements
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/fileinfo/libmagic/cdf.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -17,6 +17,7 @@ PHP NEWS . Removed call_user_method() and call_user_method_array() functions. (Kalle) . Fix user session handlers (See rfc:session.user.return-value). (Sara) . Added intdiv() function. (Andrea) + . Improved precision of log() function for base 2 and 10. (Marc Bennewitz) - XSL: . Fixed bug #64776 (The XSLT extension is not thread safe). (Mike) diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c index ad285cfe18..c86763faa0 100644 --- a/ext/fileinfo/libmagic/cdf.c +++ b/ext/fileinfo/libmagic/cdf.c @@ -823,7 +823,7 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, q = (const uint8_t *)(const void *) ((const char *)(const void *)p + ofs - 2 * sizeof(uint32_t)); - if (q > e) { + if (q < p || q > e) { DPRINTF(("Ran of the end %p > %p\n", q, e)); goto out; } |