summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <rcollet@redhat.com>2014-08-14 17:19:03 -0700
committerJulien Pauli <jpauli@php.net>2014-08-19 15:01:19 +0200
commitcba5120407fbd0735b9aac5ede2fd02bdfab46a9 (patch)
tree169d0dc091e8ec6d2bb23fd9ee0dfd52962ff59b
parent0c3302fb217e7dcc08bbd0e2df89ed80c500a069 (diff)
downloadphp-git-cba5120407fbd0735b9aac5ede2fd02bdfab46a9.tar.gz
Fix bug #67716 - Segfault in cdf.c
-rw-r--r--ext/fileinfo/libmagic/cdf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c
index 429f3b952f..2c0a2d9dfc 100644
--- a/ext/fileinfo/libmagic/cdf.c
+++ b/ext/fileinfo/libmagic/cdf.c
@@ -820,7 +820,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;
}