[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] com php-src: Fixed bug #75742 (potential memleak in internal classes's static members): NE
From:       Xinchen Hui <laruence () php ! net>
Date:       2017-12-28 8:31:09
Message-ID: php-mail-3fbd593b08c456b976454f838794810c580656327 () git ! php ! net
[Download RAW message or body]

Commit:    650264e360e7cda8b224283dde55673ed022314d
Author:    Xinchen Hui <laruence@gmail.com>         Thu, 28 Dec 2017 16:31:09 +0800
Parents:   4b5e182d61e974925ba558f3b5a666606cf85f33
Branches:  PHP-7.2 master

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

Log:
Fixed bug #75742 (potential memleak in internal classes's static members)

Bugs:
https://bugs.php.net/75742

Changed paths:
  M  NEWS
  M  Zend/zend_execute_API.c


Diff:
diff --git a/NEWS b/NEWS
index 9237ffd..a330bba 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? ????, PHP 7.2.2
 
 - Core:
+  . Fixed bug #75742 (potential memleak in internal classes's static members).
+    (Laruence)
   . Fixed bug #75679 (Path 260 character problem). (Anatol)
   . Fixed bug #75614 (Some non-portable == in shell scripts). (jdolecek)
 
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index a619b3c..adf5f96 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -296,6 +296,8 @@ void shutdown_executor(void) /* {{{ */
 				break;
 			}
 		} ZEND_HASH_FOREACH_END_DEL();
+
+		zend_cleanup_internal_classes();
 	} else {
 		zend_hash_graceful_reverse_destroy(&EG(symbol_table));
 
@@ -358,6 +360,8 @@ void shutdown_executor(void) /* {{{ */
 			} ZEND_HASH_FOREACH_END_DEL();
 		}
 
+		zend_cleanup_internal_classes();
+
 		while (EG(symtable_cache_ptr)>=EG(symtable_cache)) {
 			zend_hash_destroy(*EG(symtable_cache_ptr));
 			FREE_HASHTABLE(*EG(symtable_cache_ptr));
@@ -388,8 +392,6 @@ void shutdown_executor(void) /* {{{ */
 
 	EG(ht_iterators_used) = 0;
 
-	zend_cleanup_internal_classes();
-
 	zend_shutdown_fpu();
 }
 /* }}} */


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

[prev in list] [next in list] [prev in thread] [next in thread]