com php-src: Partially reapply ba40f505e5804a5f62a1e220b0dce9d417a27f4d: ext/fileinfo/libmagic/cdf.c

Commit: 0c8454c02ddf095bdc148980fa64f5762a03bedb Author: Anatol Belski <ab@php.net> Thu, 30 May 2019 02:48:01 +0200 Parents: 57c23df142598a2aa87dc856bab335d14b3669c1 Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0c8454c02ddf095bdc148980fa64f5762a03bedb Log: Partially reapply ba40f505e5804a5f62a1e220b0dce9d417a27f4d Changed paths: M ext/fileinfo/libmagic/cdf..c Diff: diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c index 1a6b149..28427df 100644 --- a/ext/fileinfo/libmagic/cdf.c +++ b/ext/fileinfo/libmagic/cdf.c @@ -388,9 +388,8 @@ ssize_t cdf_read_sector(const cdf_info_t *info, void *buf, size_t offs, size_t len, const cdf_header_t *h, cdf_secid_t id) { - size_t ss = CDF_SEC_SIZE(h); size_t pos = CDF_SEC_POS(h, id); - assert(ss == len); + assert(CDF_SEC_SIZE(h) == len); return cdf_read(info, CAST(zend_off_t, pos), RCAST(char *, buf) + offs, len); } @@ -398,9 +397,8 @@ ssize_t cdf_read_short_sector(const cdf_stream_t *sst, void *buf, size_t offs, size_t len, const cdf_header_t *h, cdf_secid_t id) { - size_t ss = CDF_SHORT_SEC_SIZE(h); size_t pos = CDF_SHORT_SEC_POS(h, id); - assert(ss == len); + assert(CDF_SHORT_SEC_SIZE(h) == len); if (pos + len > CDF_SEC_SIZE(h) * sst->sst_len) { DPRINTF(("Out of bounds read %" SIZE_T_FORMAT "u > %" SIZE_T_FORMAT "u\n",