Fix another PHP 7.3 segfault

rlerdorf · rlerdorf · commit 4aba0661b16f · 2019-07-17T16:20:43.000-04:00
diff --git a/oauth.c b/oauth.c
@@ -1451,7 +1451,7 @@ static long oauth_fetch(php_so_object *soo, const char *url, const char *method,
 	}
 
 	/* additional http headers can be passed */
-	if (!request_headers) {
+	if (!request_headers || !zend_hash_num_elements(Z_ARRVAL_P(request_headers))) {
 		ALLOC_HASHTABLE(rheaders);
 		zend_hash_init(rheaders, 0, NULL, ZVAL_PTR_DTOR, 0);
 		need_to_free_rheaders = 1;

Original file line number	Diff line number	Diff line change
`@@ -1451,7 +1451,7 @@ static long oauth_fetch(php_so_object soo, const char url, const char *method,`
`1451`	`1451`	`}`
`1452`	`1452`
`1453`	`1453`	`/* additional http headers can be passed */`
`1454`		`- if (!request_headers) {`
	`1454`	`+ if (!request_headers \|\| !zend_hash_num_elements(Z_ARRVAL_P(request_headers))) {`
`1455`	`1455`	`ALLOC_HASHTABLE(rheaders);`
`1456`	`1456`	`zend_hash_init(rheaders, 0, NULL, ZVAL_PTR_DTOR, 0);`
`1457`	`1457`	`need_to_free_rheaders = 1;`