diff options
| author | Remi Collet <remi@php.net> | 2014-06-10 14:33:37 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-06-10 14:33:37 +0200 |
| commit | 25b1dc917a53787dbb2532721ca22f3f36eb13c0 (patch) | |
| tree | c98c40fb4e639538f134f17002f9d5af44f6accf | |
| parent | da5d40bae6505364c3604385a2b6ae4e27a4a5d6 (diff) | |
| download | php-git-25b1dc917a53787dbb2532721ca22f3f36eb13c0.tar.gz | |
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
Upstream:
https://github.com/file/file/commit/93e063ee374b6a75729df9e7201fb511e47e259d
Adapted for C standard.
| -rw-r--r-- | ext/fileinfo/libmagic/cdf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c index ee467a6671..429f3b952f 100644 --- a/ext/fileinfo/libmagic/cdf.c +++ b/ext/fileinfo/libmagic/cdf.c @@ -812,7 +812,11 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h, if (cdf_check_stream_offset(sst, h, e, 0, __LINE__) == -1) goto out; for (i = 0; i < sh.sh_properties; i++) { - size_t ofs = CDF_GETUINT32(p, (i << 1) + 1); + size_t ofs, tail = (i << 1) + 1; + if (cdf_check_stream_offset(sst, h, p, tail * sizeof(uint32_t), + __LINE__) == -1) + goto out; + ofs = CDF_GETUINT32(p, tail); q = (const uint8_t *)(const void *) ((const char *)(const void *)p + ofs - 2 * sizeof(uint32_t)); |