svn: /php/php-src/ branches/PHP_5_3/main/php_ini.c branches/PHP_5_4/main/php_ini.c trunk/main/php_ini.c
| From: | Rasmus Lerdorf | Date: | Sat, 06 Aug 2011 21:10:29 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/main/php_ini.c branches/PHP_5_4/main/php_ini.c trunk/main/php_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-65720@lists.php.net to get a copy of this message | ||
rasmus Sat, 06 Aug 2011 21:10:29 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314383
Log:
Fix another Coverity warning by initializing this to NULL prior to the strtok_r call
Changed paths:
U php/php-src/branches/PHP_5_3/main/php_ini.c
U php/php-src/branches/PHP_5_4/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-08-06 18:48:37 UTC (rev 314382)
+++ php/php-src/branches/PHP_5_3/main/php_ini.c 2011-08-06 21:10:29 UTC (rev 314383)
@@ -486,7 +486,7 @@
if ((envpath = getenv("PATH")) != NULL) {
char *search_dir, search_path[MAXPATHLEN];
- char *last;
+ char *last = NULL;
path = estrdup(envpath);
search_dir = php_strtok_r(path, ":", &last);
Modified: php/php-src/branches/PHP_5_4/main/php_ini.c
===================================================================
--- php/php-src/branches/PHP_5_4/main/php_ini.c 2011-08-06 18:48:37 UTC (rev 314382)
+++ php/php-src/branches/PHP_5_4/main/php_ini.c 2011-08-06 21:10:29 UTC (rev 314383)
@@ -484,7 +484,7 @@
if ((envpath = getenv("PATH")) != NULL) {
char *search_dir, search_path[MAXPATHLEN];
- char *last;
+ char *last = NULL;
path = estrdup(envpath);
search_dir = php_strtok_r(path, ":", &last);
Modified: php/php-src/trunk/main/php_ini.c
===================================================================
--- php/php-src/trunk/main/php_ini.c 2011-08-06 18:48:37 UTC (rev 314382)
+++ php/php-src/trunk/main/php_ini.c 2011-08-06 21:10:29 UTC (rev 314383)
@@ -484,7 +484,7 @@
if ((envpath = getenv("PATH")) != NULL) {
char *search_dir, search_path[MAXPATHLEN];
- char *last;
+ char *last = NULL;
path = estrdup(envpath);
search_dir = php_strtok_r(path, ":", &last);