Commit:    2d87dce1edb5cfd4699accf2e8e238c5a6ca074d
Author:    Dmitry Stogov <dmi...@zend.com>         Tue, 19 Feb 2013 18:00:49 
+0400
Parents:   511b33ccdf290b4833dbaeff96df984abe157a47
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=2d87dce1edb5cfd4699accf2e8e238c5a6ca074d

Log:
Avoid buffer overrun

Changed paths:
  M  zend_accelerator_blacklist.c


Diff:
diff --git a/zend_accelerator_blacklist.c b/zend_accelerator_blacklist.c
index 52f4216..804124b 100644
--- a/zend_accelerator_blacklist.c
+++ b/zend_accelerator_blacklist.c
@@ -183,9 +183,9 @@ void zend_accel_blacklist_load(zend_blacklist *blacklist, 
char *filename)
        while (fgets(buf, MAXPATHLEN, fp)!=NULL) {
                char *path_dup, *pbuf;
                path_length = strlen(buf);
-               if (buf[path_length-1]=='\n') {
+               if (path_length > 0 && buf[path_length-1]=='\n') {
                        buf[--path_length] = 0;
-                       if (buf[path_length-1]=='\r') {
+                       if (path_length > 0 && buf[path_length-1]=='\r') {
                                buf[--path_length] = 0;
                        }
                }


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

Reply via email to