From: Antony Dovgal <tony2001@php.net>
Date: Fri, 29 Aug 2008 10:53:07 +0000 (+0000)
Subject: fix invalid read
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~539
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=914f8ceb09af3526588d6d45edda6fb8170413c8;p=php

fix invalid read

weird, the code uses correct order of checks just ten lines below
---

diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index 6661fe4240..dc928658a5 100644
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -131,8 +131,8 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 
 		if ((m->flag & BINTEST) != mode) {
 			/* Skip sub-tests */
-			while (magic[magindex + 1].cont_level != 0 && ++magindex < nmagic) {
-				continue;
+			while (magindex < nmagic - 1 && magic[magindex + 1].cont_level != 0) {
+				magindex++;
 			}
 			continue; /* Skip to next top-level test*/
 		}