Ticket #8620: 8620-isset-works-best-patch-less-complex-flow-with-input-sanitization.patch

wp-includes/http.php

@@ -1962 +1962 @@
  * @return array The headers of the response. Empty array if incorrect parameter given.
  */
 function wp_remote_retrieve_headers(&$response) {
-        if ( is_wp_error($response) || ! isset($response['headers']) || ! is_array($response['headers']))
-                return array();
-
-        return $response['headers'];
+        $sanitzed = (array) $response;  
+        if ( isset($sanitzed['headers']) && is_array($sanitzed['headers']) ) 
+                return $sanitzed['headers'];    
+        return array();
 }
 
 /**
@@ -1978 +1978 @@
  * @return string The header value. Empty string on if incorrect parameter given, or if the header doesnt exist.
  */
 function wp_remote_retrieve_header(&$response, $header) {
-        if ( is_wp_error($response) || ! isset($response['headers']) || ! is_array($response['headers']))
-                return '';
-
-        if ( array_key_exists($header, $response['headers']) )
-                return $response['headers'][$header];
-
-        return '';
+        $sanitzed = (array) $response;
+        return isset($sanitzed['headers'][$header]) ? $sanitzed['headers'][$header] : '';
 }
 
 /**
@@ -1998 +1993 @@
  * @return string the response code. Empty string on incorrect parameter given.
  */
 function wp_remote_retrieve_response_code(&$response) {
-        if ( is_wp_error($response) ||! isset($response['response']) || ! is_array($response['response']))
-                return '';
-
-        return $response['response']['code'];
+        $sanitzed = (array) $response;
+        return isset($sanitzed['response']['code']) ? $sanitzed['response']['code'] : '';
 }
 
 /**
@@ -2015 +2008 @@
  * @return string The response message. Empty string on incorrect parameter given.
  */
 function wp_remote_retrieve_response_message(&$response) {
-        if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
-                return '';
-
-        return $response['response']['message'];
+        $sanitzed = (array) $response;
+        return isset($sanitzed['response']['message']) ? $sanitzed['response']['message'] : '';
 }
 
 /**
@@ -2030 +2021 @@
  * @return string The body of the response. Empty string if no body or incorrect parameter given.
  */
 function wp_remote_retrieve_body(&$response) {
-        if ( is_wp_error($response) || ! isset($response['body']) )
-                return '';
-
-        return $response['body'];
+        $sanitzed = (array) $response;
+        return isset($sanitzed['body']) ? $sanitzed['body'] : '';
 }
 
 ?>