]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 8 Jan 2020 17:43:35 +0000 (18:43 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 8 Jan 2020 17:43:35 +0000 (18:43 +0100)
* PHP-7.4:
  Fix #79078: Hypothetical use-after-free in curl_multi_add_handle()

1  2 
ext/curl/multi.c

index 4dbd9ff5a574f7d70377eba4457002a766708b9b,eeae16d28cf0b45bb0d43c2526fb1ca07ea5aad5..9cd0a947a3ec784cb5bbf9034365eeea628b7968
@@@ -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));