[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo/libmagic softmagic.c

[Antony Dovgal]

tony2001                Fri Aug 29 10:53:14 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/fileinfo/libmagic      softmagic.c 
  Log:
  fix invalid read
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/softmagic.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/fileinfo/libmagic/softmagic.c
diff -u php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.3 
php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.4
--- php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.3   Fri Aug 29 10:12:29 2008
+++ php-src/ext/fileinfo/libmagic/softmagic.c   Fri Aug 29 10:53:13 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*/
                }

Advertising

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php