[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c

[Johannes Schlüter]

johannes                                 Mon, 16 May 2011 19:46:32 +0000

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

Log:
- Fix possible memory leak
# Found by parfait - http://labs.oracle.com/projects/parfait/

Changed paths:
    U   php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
    U   php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c
    U   php/php-src/trunk/TSRM/tsrm_virtual_cwd.c

Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c        2011-05-16 
19:40:12 UTC (rev 311103)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c        2011-05-16 
19:46:32 UTC (rev 311104)
@@ -1079,6 +1079,7 @@
                                }
                                if (is_dir && !directory) {
                                        /* not a directory */
+                                       tsrm_free_alloca(tmp, use_heap);
                                        return -1;
                                }
                        }

Modified: php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c        2011-05-16 
19:40:12 UTC (rev 311103)
+++ php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c        2011-05-16 
19:46:32 UTC (rev 311104)
@@ -1067,6 +1067,7 @@
                                }
                                if (is_dir && !directory) {
                                        /* not a directory */
+                                       tsrm_free_alloca(tmp, use_heap);
                                        return -1;
                                }
                        }

Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===================================================================
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2011-05-16 19:40:12 UTC (rev 
311103)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c   2011-05-16 19:46:32 UTC (rev 
311104)
@@ -1067,6 +1067,7 @@
                                }
                                if (is_dir && !directory) {
                                        /* not a directory */
+                                       tsrm_free_alloca(tmp, use_heap);
                                        return -1;
                                }
                        }


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