Fixed NULL pointer dereference

dstogov · dstogov · commit 59590663d786 · 2021-02-20T11:20:29.000+03:00
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
@@ -620,7 +620,8 @@ static HashTable *zend_closure_get_gc(zend_object *obj, zval **table, int *n) /*
 
 	*table = Z_TYPE(closure->this_ptr) != IS_NULL ? &closure->this_ptr : NULL;
 	*n = Z_TYPE(closure->this_ptr) != IS_NULL ? 1 : 0;
-	return (closure->func.type == ZEND_USER_FUNCTION) ?
+	return (closure->func.type == ZEND_USER_FUNCTION &&
+		closure->func.op_array.static_variables) ?
 		ZEND_MAP_PTR_GET(closure->func.op_array.static_variables_ptr) : NULL;
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,8 @@ static HashTable zend_closure_get_gc(zend_object obj, zval *table, int n) /*`
`620`	`620`
`621`	`621`	`*table = Z_TYPE(closure->this_ptr) != IS_NULL ? &closure->this_ptr : NULL;`
`622`	`622`	`*n = Z_TYPE(closure->this_ptr) != IS_NULL ? 1 : 0;`
`623`		`- return (closure->func.type == ZEND_USER_FUNCTION) ?`
	`623`	`+ return (closure->func.type == ZEND_USER_FUNCTION &&`
	`624`	`+ closure->func.op_array.static_variables) ?`
`624`	`625`	`ZEND_MAP_PTR_GET(closure->func.op_array.static_variables_ptr) : NULL;`
`625`	`626`	`}`
`626`	`627`	`/* }}} */`