]> granicus.if.org Git - php/commitdiff
Convert infallible mysqli checks to asserts
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 9 Jan 2020 17:55:31 +0000 (18:55 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 9 Jan 2020 17:56:30 +0000 (18:56 +0100)
ext/mysqli/php_mysqli_structs.h

index a1751f97b258cd40aed0e2a014dbdf3fe894c2f2..1b016aab42d88edc1b510a1eb79d82a4def38301 100644 (file)
@@ -273,21 +273,13 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
 #define MYSQLI_FETCH_RESOURCE_CONN(__ptr, __id, __check) \
 { \
        MYSQLI_FETCH_RESOURCE((__ptr), MY_MYSQL *, (__id), "mysqli_link", (__check)); \
-       if (!(__ptr)->mysql) { \
-               mysqli_object *intern = Z_MYSQLI_P(__id); \
-               php_error_docref(NULL, E_WARNING, "invalid object or resource %s\n", ZSTR_VAL(intern->zo.ce->name)); \
-               RETURN_NULL(); \
-       } \
+       ZEND_ASSERT((__ptr)->mysql && "Missing connection?"); \
 }
 
 #define MYSQLI_FETCH_RESOURCE_STMT(__ptr, __id, __check) \
 { \
        MYSQLI_FETCH_RESOURCE((__ptr), MY_STMT *, (__id), "mysqli_stmt", (__check)); \
-       if (!(__ptr)->stmt) { \
-               mysqli_object *intern = Z_MYSQLI_P(__id); \
-               php_error_docref(NULL, E_WARNING, "invalid object or resource %s\n", ZSTR_VAL(intern->zo.ce->name)); \
-               RETURN_NULL();\
-       } \
+       ZEND_ASSERT((__ptr)->stmt && "Missing statement?"); \
 }
 
 #define MYSQLI_SET_STATUS(__id, __value) \