Skip to content

Fix #78666 mysqli_options generates Warning on var_dump() #5121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix #78666 mysqli_options generates Warning on var_dump() #5121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70cb8f9
Fix #78666 mysqli_options generates Warning on var_dump()
kocsismate Jan 24, 2020
0ef6b2b
Address code review comments
kocsismate Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions ext/mysqli/mysqli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ zend_class_entry *mysqli_warning_class_entry;
zend_class_entry *mysqli_exception_class_entry;


typedef zval *(*mysqli_read_t)(mysqli_object *obj, zval *rv);
typedef int (*mysqli_read_t)(mysqli_object *obj, zval *rv, zend_bool quiet);
typedef int (*mysqli_write_t)(mysqli_object *obj, zval *newval);

typedef struct _mysqli_prop_handler {
Expand Down Expand Up @@ -281,17 +281,21 @@ static void mysqli_warning_free_storage(zend_object *object)
/* }}} */

/* {{{ mysqli_read_na */
static zval *mysqli_read_na(mysqli_object *obj, zval *retval)
static int mysqli_read_na(mysqli_object *obj, zval *retval, zend_bool quiet)
{
zend_throw_error(NULL, "Cannot read property");
return NULL;
if (!quiet) {
zend_throw_error(NULL, "Cannot read property");
}

return FAILURE;
}
/* }}} */

/* {{{ mysqli_write_na */
static int mysqli_write_na(mysqli_object *obj, zval *newval)
{
zend_throw_error(NULL, "Cannot write property");

return FAILURE;
}
/* }}} */
Expand Down Expand Up @@ -320,8 +324,9 @@ zval *mysqli_read_property(zval *object, zval *member, int type, void **cache_sl
}

if (hnd) {
retval = hnd->read_func(obj, rv);
if (retval == NULL) {
if (hnd->read_func(obj, rv, type == BP_VAR_IS) == SUCCESS || type != BP_VAR_IS) {
retval = rv;
} else {
retval = &EG(uninitialized_zval);
}
} else {
Expand Down Expand Up @@ -435,6 +440,7 @@ HashTable *mysqli_object_get_debug_info(zval *object, int *is_temp)
zval rv, member;
zval *value;
ZVAL_STR(&member, entry->name);

value = mysqli_read_property(object, &member, BP_VAR_IS, 0, &rv);
if (value != &EG(uninitialized_zval)) {
zend_hash_add(retval, Z_STR(member), value);
Expand Down
32 changes: 18 additions & 14 deletions ext/mysqli/mysqli_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
#include "mysqli_fe.h"

#define MAP_PROPERTY_MYG_BOOL_READ(name, value) \
static zval *name(mysqli_object *obj, zval *retval) \
static int name(mysqli_object *obj, zval *retval, zend_bool quiet) \
{ \
ZVAL_BOOL(retval, MyG(value)); \
return retval; \
return SUCCESS; \
} \

#define MAP_PROPERTY_MYG_BOOL_WRITE(name, value) \
Expand All @@ -44,10 +44,10 @@ static int name(mysqli_object *obj, zval *value) \
} \

#define MAP_PROPERTY_MYG_LONG_READ(name, value) \
static zval *name(mysqli_object *obj, zval *retval) \
static int name(mysqli_object *obj, zval *retval, zend_bool quiet) \
{ \
ZVAL_LONG(retval, MyG(value)); \
return retval; \
return SUCCESS; \
} \

#define MAP_PROPERTY_MYG_LONG_WRITE(name, value) \
Expand All @@ -58,10 +58,10 @@ static int name(mysqli_object *obj, zval *value) \
} \

#define MAP_PROPERTY_MYG_STRING_READ(name, value) \
static zval *name(mysqli_object *obj, zval *retval) \
static int name(mysqli_object *obj, zval *retval, zend_bool quiet) \
{ \
ZVAL_STRING(retval, MyG(value)); \
return retval; \
return SUCCESS; \
} \

#define MAP_PROPERTY_MYG_STRING_WRITE(name, value) \
Expand All @@ -82,34 +82,38 @@ static int driver_report_write(mysqli_object *obj, zval *value)
/* }}} */

/* {{{ property driver_embedded_read */
static zval *driver_embedded_read(mysqli_object *obj, zval *retval)
static int driver_embedded_read(mysqli_object *obj, zval *retval, zend_bool quiet)
{
ZVAL_FALSE(retval);
return retval;

return SUCCESS;
}
/* }}} */

/* {{{ property driver_client_version_read */
static zval *driver_client_version_read(mysqli_object *obj, zval *retval)
static int driver_client_version_read(mysqli_object *obj, zval *retval, zend_bool quiet)
{
ZVAL_LONG(retval, MYSQL_VERSION_ID);
return retval;

return SUCCESS;
}
/* }}} */

/* {{{ property driver_client_info_read */
static zval *driver_client_info_read(mysqli_object *obj, zval *retval)
static int driver_client_info_read(mysqli_object *obj, zval *retval, zend_bool quiet)
{
ZVAL_STRING(retval, (char *)mysql_get_client_info());
return retval;

return SUCCESS;
}
/* }}} */

/* {{{ property driver_driver_version_read */
static zval *driver_driver_version_read(mysqli_object *obj, zval *retval)
static int driver_driver_version_read(mysqli_object *obj, zval *retval, zend_bool quiet)
{
ZVAL_LONG(retval, MYSQLI_VERSION_ID);
return retval;

return SUCCESS;
}
/* }}} */

Expand Down
Loading