diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-10-17 08:18:09 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-10-17 08:18:09 +0000 |
| commit | 780fa84fbdeea2afcca4fa204d68e4619024b481 (patch) | |
| tree | 808d719ed443df139106662cec298ccf97335c3f /ext/mysqli/mysqli_api.c | |
| parent | 8a2e9e60435021447aa877531138b0ce95f255b0 (diff) | |
| download | php-git-780fa84fbdeea2afcca4fa204d68e4619024b481.tar.gz | |
MFH: use correct dtro and variable for the callback
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index c42c14a6e5..39e50a980b 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1336,7 +1336,7 @@ PHP_FUNCTION(mysqli_set_local_infile_default) MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); if (mysql->li_read) { - zval_dtor(mysql->li_read); + zval_ptr_dtor(&(mysql->li_read)); mysql->li_read = NULL; } } @@ -1364,7 +1364,6 @@ PHP_FUNCTION(mysqli_set_local_infile_handler) efree(callback_name); RETURN_FALSE; } - efree(callback_name); /* save callback function */ if (!mysql->li_read) { @@ -1372,7 +1371,7 @@ PHP_FUNCTION(mysqli_set_local_infile_handler) } else { zval_dtor(mysql->li_read); } - ZVAL_STRINGL(mysql->li_read, Z_STRVAL_P(callback_func), Z_STRLEN_P(callback_func), 1); + ZVAL_STRINGL(mysql->li_read, callback_name, 0); RETURN_TRUE; } |