cvs: php-src /ext/fileinfo/libmagic softmagic.c
| From: | Antony Dovgal | Date: | Fri, 29 Aug 2008 10:53:07 +0000 |
| Subject: | cvs: php-src /ext/fileinfo/libmagic softmagic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52739@lists.php.net to get a copy of this message | ||
tony2001 Fri Aug 29 10:53:07 2008 UTC
Modified files:
/php-src/ext/fileinfo/libmagic softmagic.c
Log:
fix invalid read
weird, the code uses correct order of checks just ten lines below
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/softmagic.c?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/fileinfo/libmagic/softmagic.c
diff -u php-src/ext/fileinfo/libmagic/softmagic.c:1.5 php-src/ext/fileinfo/libmagic/softmagic.c:1.6
--- php-src/ext/fileinfo/libmagic/softmagic.c:1.5 Fri Aug 29 10:10:56 2008
+++ php-src/ext/fileinfo/libmagic/softmagic.c Fri Aug 29 10:53:07 2008
@@ -131,8 +131,8 @@
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*/
}