Browse Source

Fix regression in detection of some CDF files, introduced in 5.11-2+deb7u4

Christoph Biedl 11 years ago
parent
commit
929e8f7daa
1 changed files with 3 additions and 2 deletions
  1. 3 2
      debian/patches/CVE-2014-3479.patch

+ 3 - 2
debian/patches/CVE-2014-3479.patch

@@ -21,10 +21,11 @@ Last-Update: 2014-09-07
 +	    CDF_SHORT_SEC_SIZE(h) : CDF_SEC_SIZE(h);
  	(void)&line;
 -	if (e >= b && (size_t)(e - b) < CDF_SEC_SIZE(h) * sst->sst_len)
-+	if (e >= b && (size_t)(e - b) < ss * sst->sst_len)
++	if (e >= b && (size_t)(e - b) <= ss * sst->sst_len)
  		return 0;
  	DPRINTF(("%d: offset begin %p end %p %" SIZE_T_FORMAT "u"
- 	    " >= %" SIZE_T_FORMAT "u [%" SIZE_T_FORMAT "u %"
+-	    " >= %" SIZE_T_FORMAT "u [%" SIZE_T_FORMAT "u %"
++	    " > %" SIZE_T_FORMAT "u [%" SIZE_T_FORMAT "u %"
  	    SIZE_T_FORMAT "u]\n", line, b, e, (size_t)(e - b),
 -	    CDF_SEC_SIZE(h) * sst->sst_len, CDF_SEC_SIZE(h), sst->sst_len));
 +	    ss * sst->sst_len, ss, sst->sst_len));