georg Tue Jun 8 02:20:58 2004 EDT Modified files: /php-src/ext/mysqli mysqli_api.c Log: fixed crash (changed MYSQL TO MY_MYSQL in mysql_stmt_init) http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.83&r2=1.84&ty=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.83 php-src/ext/mysqli/mysqli_api.c:1.84 --- php-src/ext/mysqli/mysqli_api.c:1.83 Sun Jun 6 04:52:19 2004 +++ php-src/ext/mysqli/mysqli_api.c Tue Jun 8 02:20:58 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mysqli_api.c,v 1.83 2004/06/06 08:52:19 georg Exp $ + $Id: mysqli_api.c,v 1.84 2004/06/08 06:20:58 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -1748,7 +1748,7 @@ */ PHP_FUNCTION(mysqli_stmt_init) { - MYSQL *mysql; + MY_MYSQL *mysql; MY_STMT *stmt; zval *mysql_link; MYSQLI_RESOURCE *mysqli_resource; @@ -1756,11 +1756,11 @@ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",&mysql_link, mysqli_link_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link"); stmt = (MY_STMT *)ecalloc(1,sizeof(MY_STMT)); - if (!(stmt->stmt = mysql_stmt_init(mysql))) { + if (!(stmt->stmt = mysql_stmt_init(mysql->mysql))) { efree(stmt); RETURN_FALSE; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php