From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 8 Jan 2020 17:43:35 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c6a230b7124d4a1176ebd3e2981b8c23c8a67c1;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79078: Hypothetical use-after-free in curl_multi_add_handle()
---

3c6a230b7124d4a1176ebd3e2981b8c23c8a67c1
diff --cc ext/curl/multi.c
index 4dbd9ff5a5,eeae16d28c..9cd0a947a3
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@@ -85,9 -89,11 +85,11 @@@ PHP_FUNCTION(curl_multi_add_handle
  	}
  
  	if ((ch = (php_curl *)zend_fetch_resource(Z_RES_P(z_ch), le_curl_name, le_curl)) == NULL) {
 -		RETURN_FALSE;
 +		RETURN_THROWS();
  	}
  
+ 	_php_curl_verify_handlers(ch, 1);
+ 
  	_php_curl_cleanup_handle(ch);
  
  	GC_ADDREF(Z_RES_P(z_ch));