diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-08-14 17:22:06 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-08-14 17:22:06 -0700 |
| commit | 23122ba69ce628769bd61f7f0aaecdba203fee26 (patch) | |
| tree | 6dfb6a87bbceada0b7c8e4617f048379fdb5b853 | |
| parent | ed7ab762de586de1dec3d98297b6a464b6dac686 (diff) | |
| parent | 59c2477bc331370105e917db27e82d4e483ab7f0 (diff) | |
| download | php-git-23122ba69ce628769bd61f7f0aaecdba203fee26.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
| -rw-r--r-- | ext/fileinfo/libmagic/cdf.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |