com php-src: Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS: ext/fileinfo/libmagic/cdf.c

Commit: d77ea459bd33a5267475a809a86f30a1d89ef0c2 Author: Stanislav Malyshev <stas@php.net> Mon, 26 May 2014 17:42:18 -0700 Parents: 44be7b7f276e3536395ab22fd67d11a31f8dad79 Branches: PHP-5.3 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d77ea459bd33a5267475a809a86f30a1d89ef0c2 Log: Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS Upstream fix: https://github.com/file/file/commit/f97486ef5dc3e8735440edc4fc8808c63e1a3ef0 Bugs: https://bugs.php..net/67327 Changed paths: M ext/fileinfo/libmagic/cdf.c Diff: diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf..c index 7efa43e..ffde3f4 100644 --- a/ext/fileinfo/libmagic/cdf.c +++ b/ext/fileinfo/libmagic/cdf.c @@ -823,6 +823,10 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, i, inp[i].pi_id, inp[i].pi_type, q - p, offs)); if (inp[i].pi_type & CDF_VECTOR) { nelements = CDF_GETUINT32(q, 1); + if (nelements == 0) { + DPRINTF(("CDF_VECTOR with nelements == 0\n")); + goto out; + } o = 2; } else { nelements = 1; @@ -897,7 +901,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, } DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", nelements)); - for (j = 0; j < nelements; j++, i++) { + for (j = 0; j < nelements && i < sh.sh_properties; + j++, i++) + { uint32_t l = CDF_GETUINT32(q, o); inp[i].pi_str.s_len = l; inp[i].pi_str.s_buf = (const char *)