diff options
| author | Georg Richter <georg@php.net> | 2003-12-31 08:34:02 +0000 |
|---|---|---|
| committer | Georg Richter <georg@php.net> | 2003-12-31 08:34:02 +0000 |
| commit | c10072d0672fdf13813ed07bc198a3e302a0e557 (patch) | |
| tree | 9c9ee4743d6244178cf31d36fe3d42c4f91b7f12 /ext/mysqli/mysqli_api.c | |
| parent | cd9342fb8441a6f100376b6f2950d5f3e5b9d88a (diff) | |
| download | php-git-c10072d0672fdf13813ed07bc198a3e302a0e557.tar.gz | |
fixed memleak and segfault when constructor call failed
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 3685e6eec7..21e28cc4ef 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1136,7 +1136,6 @@ PHP_FUNCTION(mysqli_num_rows) { MYSQL_RES *result; zval *mysql_result; - ulong rc; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) { return; @@ -1302,11 +1301,12 @@ PHP_FUNCTION(mysqli_read_query_result) Open a connection to a mysql server */ PHP_FUNCTION(mysqli_real_connect) { - MYSQL *mysql; - char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL; - unsigned int hostname_len, username_len, passwd_len, dbname_len, socket_len; - unsigned int port=0, flags=0; - zval *mysql_link; + MYSQL *mysql; + char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL; + unsigned int hostname_len, username_len, passwd_len, dbname_len, socket_len; + unsigned int port=0, flags=0; + zval *mysql_link; + zval *object = getThis(); if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|sssslsl", &mysql_link, mysqli_link_class_entry, &hostname, &hostname_len, &username, &username_len, &passwd, &passwd_len, &dbname, &dbname_len, &port, &socket, &socket_len, @@ -1352,6 +1352,10 @@ PHP_FUNCTION(mysqli_real_connect) } php_mysqli_set_error(mysql_errno(mysql), (char *)mysql_error(mysql) TSRMLS_CC); + if (object) { + ((mysqli_object *) zend_object_store_get_object(object TSRMLS_CC))->valid = 1; + } + RETURN_TRUE; } /* }}} */ |