[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c trunk/sapi/fpm/fpm/fpm_conf.c

[Jérôme Loyet]

fat                                      Tue, 14 Sep 2010 15:33:43 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=303365

Log:
- remove a memory leak (missing efree())

Changed paths:
    U   php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
    U   php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c

Modified: php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c        2010-09-14 
14:26:37 UTC (rev 303364)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/fpm/fpm_conf.c        2010-09-14 
15:33:43 UTC (rev 303365)
@@ -716,11 +716,13 @@
 #ifdef GLOB_NOMATCH
                        if (i == GLOB_NOMATCH) {
                                zlog(ZLOG_STUFF, ZLOG_WARNING, "Nothing matches 
the include pattern '%s' from %s at line %d.", inc, filename, ini_lineno);
+                               efree(filename);
                                return;
                        }
 #endif /* GLOB_NOMATCH */
                        zlog(ZLOG_STUFF, ZLOG_ERROR, "Unable to globalize '%s' 
(ret=%d) from %s at line %d.", inc, i, filename, ini_lineno);
                        *error = 1;
+                       efree(filename);
                        return;
                }

@@ -731,6 +733,7 @@
                        if (0 > fpm_conf_load_ini_file(g.gl_pathv[i] 
TSRMLS_CC)) {
                                zlog(ZLOG_STUFF, ZLOG_ERROR, "Unable to include 
%s from %s at line %d", g.gl_pathv[i], filename, ini_lineno);
                                *error = 1;
+                               efree(filename);
                                return;
                        }
                }
@@ -740,9 +743,12 @@
        if (0 > fpm_conf_load_ini_file(inc TSRMLS_CC)) {
                zlog(ZLOG_STUFF, ZLOG_ERROR, "Unable to include %s from %s at 
line %d", inc, filename, ini_lineno);
                *error = 1;
+               efree(filename);
                return;
        }
 #endif /* HAVE_GLOB */
+
+       efree(filename);
 }
 /* }}} */


Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c   2010-09-14 14:26:37 UTC (rev 
303364)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c   2010-09-14 15:33:43 UTC (rev 
303365)
@@ -716,11 +716,13 @@
 #ifdef GLOB_NOMATCH
                        if (i == GLOB_NOMATCH) {
                                zlog(ZLOG_STUFF, ZLOG_WARNING, "Nothing matches 
the include pattern '%s' from %s at line %d.", inc, filename, ini_lineno);
+                               efree(filename);
                                return;
                        }
 #endif /* GLOB_NOMATCH */
                        zlog(ZLOG_STUFF, ZLOG_ERROR, "Unable to globalize '%s' 
(ret=%d) from %s at line %d.", inc, i, filename, ini_lineno);
                        *error = 1;
+                       efree(filename);
                        return;
                }

@@ -731,6 +733,7 @@
                        if (0 > fpm_conf_load_ini_file(g.gl_pathv[i] 
TSRMLS_CC)) {
                                zlog(ZLOG_STUFF, ZLOG_ERROR, "Unable to include 
%s from %s at line %d", g.gl_pathv[i], filename, ini_lineno);
                                *error = 1;
+                               efree(filename);
                                return;
                        }
                }
@@ -740,9 +743,12 @@
        if (0 > fpm_conf_load_ini_file(inc TSRMLS_CC)) {
                zlog(ZLOG_STUFF, ZLOG_ERROR, "Unable to include %s from %s at 
line %d", inc, filename, ini_lineno);
                *error = 1;
+               efree(filename);
                return;
        }
 #endif /* HAVE_GLOB */
+
+       efree(filename);
 }
 /* }}} */



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