From: Anatol Belski <ab@php.net>
Date: Thu, 30 May 2019 00:48:01 +0000 (+0200)
Subject: Partially reapply ba40f505e5804a5f62a1e220b0dce9d417a27f4d
X-Git-Tag: php-7.4.0alpha1~149
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c8454c02ddf095bdc148980fa64f5762a03bedb;p=php

Partially reapply ba40f505e5804a5f62a1e220b0dce9d417a27f4d
---

diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c
index 1a6b149570..28427dfb64 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",