Changeset 48322

Timestamp:

07/05/2020 03:20:16 PM (4 years ago)

Author:

SergeyBiryukov

Message:

XML-RPC: Explicitly unset the reference to the parser resource after calling xml_parser_free() to avoid memory leaks in PHP 7.0.0 or higher.

Props procifer, ayeshrajans.
Fixes #49700.

Location:

trunk/src

Files:

• wp-admin/link-parse-opml.php (modified) (1 diff)
• wp-includes/IXR/class-IXR-message.php (modified) (1 diff)
• wp-includes/atomlib.php (modified) (1 diff)
• wp-includes/feed.php (modified) (1 diff)
• wp-includes/rss.php (modified) (1 diff)

trunk/src/wp-admin/link-parse-opml.php

@@ -95 +95 @@
 // Free up memory used by the XML parser.
 xml_parser_free( $xml_parser );
+unset( $xml_parser );

trunk/src/wp-includes/IXR/class-IXR-message.php

@@ -111 +111 @@
 
         $final = false;
+
         do {
             if (strlen($this->message) <= $chunk_size) {
                 $final = true;
             }
+
             $part = substr($this->message, 0, $chunk_size);
             $this->message = substr($this->message, $chunk_size);
+
             if (!xml_parse($this->_parser, $part, $final)) {
+                xml_parser_free($this->_parser);
+                unset($this->_parser);
                 return false;
             }
+
             if ($final) {
                 break;
             }
         } while (true);
+
         xml_parser_free($this->_parser);
+        unset($this->_parser);
 
         // Grab the error messages, if any

trunk/src/wp-includes/atomlib.php

@@ -183 +183 @@
 
         xml_parser_free($parser);
+        unset($parser);
 
         restore_error_handler();

trunk/src/wp-includes/feed.php

@@ -565 +565 @@
     $code = xml_get_error_code( $parser );
     xml_parser_free( $parser );
+    unset( $parser );
 
     if ( ! $code ) {

trunk/src/wp-includes/rss.php

@@ -95 +95 @@
 
         xml_parser_free( $this->parser );
+        unset( $this->parser );
 
         $this->normalize();