svn: /php/php-src/ branches/PHP_5_3/main/php_ini.c trunk/main/php_ini.c
| From: | Pierre Joye | Date: | Mon, 17 Jan 2011 14:29:16 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/main/php_ini.c trunk/main/php_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64371@lists.php.net to get a copy of this message | ||
pajoye Mon, 17 Jan 2011 14:29:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=307541
Log:
- path len sanity check
Changed paths:
U php/php-src/branches/PHP_5_3/main/php_ini.c
U php/php-src/trunk/main/php_ini.c
Modified: php/php-src/branches/PHP_5_3/main/php_ini.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/php_ini.c 2011-01-17 14:23:57 UTC (rev 307540)
+++ php/php-src/branches/PHP_5_3/main/php_ini.c 2011-01-17 14:29:16 UTC (rev 307541)
@@ -824,6 +824,10 @@
#if PHP_WIN32
char path_bak[MAXPATHLEN];
+
+ if (path_len > MAXPATHLEN) {
+ return;
+ }
memcpy(path_bak, path, path_len);
path_bak[path_len] = 0;
TRANSLATE_SLASHES_LOWER(path_bak);
Modified: php/php-src/trunk/main/php_ini.c
===================================================================
--- php/php-src/trunk/main/php_ini.c 2011-01-17 14:23:57 UTC (rev 307540)
+++ php/php-src/trunk/main/php_ini.c 2011-01-17 14:29:16 UTC (rev 307541)
@@ -820,6 +820,10 @@
#if PHP_WIN32
char path_bak[MAXPATHLEN];
+
+ if (path_len > MAXPATHLEN) {
+ return;
+ }
memcpy(path_bak, path, path_len);
path_bak[path_len] = 0;
TRANSLATE_SLASHES_LOWER(path_bak);