diff options
| author | Antony Dovgal <tony2001@php.net> | 2005-10-10 20:03:00 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2005-10-10 20:03:00 +0000 |
| commit | a5cea052e8a34ac38923d38261b2025f229133ee (patch) | |
| tree | 5faca3b86e173402b19fbdc757d9aaaf96e44ce2 /ext/mysqli/mysqli_warning.c | |
| parent | 44205dc58ae7fbe08f107da11fc9f70196949069 (diff) | |
| download | php-git-a5cea052e8a34ac38923d38261b2025f229133ee.tar.gz | |
fix #34818 (new mysqli_stmt() and several others crash if the first parameter is not a valid mysqli_link)
Diffstat (limited to 'ext/mysqli/mysqli_warning.c')
| -rw-r--r-- | ext/mysqli/mysqli_warning.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c index 3ea578f6c7..10e49697cb 100644 --- a/ext/mysqli/mysqli_warning.c +++ b/ext/mysqli/mysqli_warning.c @@ -166,7 +166,7 @@ int mysqli_warning_errno(mysqli_object *obj, zval **retval TSRMLS_DC) /* {{{ mysqli_warning_construct(object obj) */ PHP_METHOD(mysqli_warning, __construct) { - zval **z; + zval *z; mysqli_object *obj; MYSQL *hdl; MYSQLI_WARNING *w; @@ -175,18 +175,18 @@ PHP_METHOD(mysqli_warning, __construct) if (ZEND_NUM_ARGS() != 1) { WRONG_PARAM_COUNT; } - if (zend_get_parameters_ex(1, &z)==FAILURE) { + if (zend_parse_parameters(1, "o", &z)==FAILURE) { return; } - obj = (mysqli_object *)zend_object_store_get_object(*(z) TSRMLS_CC);\ + obj = (mysqli_object *)zend_object_store_get_object(z TSRMLS_CC);\ if (obj->zo.ce == mysqli_link_class_entry) { MY_MYSQL *mysql; - MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, z, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &z, "mysqli_link"); hdl = mysql->mysql; } else if (obj->zo.ce == mysqli_stmt_class_entry) { MY_STMT *stmt; - MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, z, "mysqli_stmt"); + MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &z, "mysqli_stmt"); hdl = stmt->stmt->mysql; } else { RETURN_FALSE; |