archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed error reporting in mysqli_stmt::__construct

Browse source 
For the sake of simplicity, I've synchronized the implementation
with PHP 8, which means null values are also accepted.

Closes GH-6454.
This commit is contained in:
Dharman 2020-11-24 23:02:04 +00:00 • committed by Nikita Popov
parent e3e67b721f
commit 233f507fe6
2 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

41
ext/mysqli/mysqli.c
View file

@ -1041,51 +1041,38 @@ PHP_FUNCTION(mysqli_stmt_construct)
zval *mysql_link; zval *mysql_link;
MY_STMT *stmt; MY_STMT *stmt;
MYSQLI_RESOURCE *mysqli_resource; MYSQLI_RESOURCE *mysqli_resource;
char *statement; char *statement = NULL;
size_t statement_len; size_t statement_len;
switch (ZEND_NUM_ARGS()) if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|s!", &mysql_link, mysqli_link_class_entry, &statement, &statement_len) == FAILURE) {
{
case 1: /* mysql_stmt_init */
if (zend_parse_parameters(1, "O", &mysql_link, mysqli_link_class_entry)==FAILURE) {
return; return;
} }
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
stmt = (MY_STMT *)ecalloc(1,sizeof(MY_STMT)); stmt = (MY_STMT *) ecalloc(1, sizeof(MY_STMT));
stmt->stmt = mysql_stmt_init(mysql->mysql); if (!(stmt->stmt = mysql_stmt_init(mysql->mysql))) {
break;
case 2:
if (zend_parse_parameters(2, "Os", &mysql_link, mysqli_link_class_entry, &statement, &statement_len)==FAILURE) {
return;
}
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
stmt = (MY_STMT *)ecalloc(1,sizeof(MY_STMT));
if ((stmt->stmt = mysql_stmt_init(mysql->mysql))) {
mysql_stmt_prepare(stmt->stmt, (char *)statement, statement_len);
}
break;
default:
WRONG_PARAM_COUNT;
break;
}
if (!stmt->stmt) {
efree(stmt); efree(stmt);
RETURN_FALSE; RETURN_FALSE;
} }
#ifndef MYSQLI_USE_MYSQLND #ifndef MYSQLI_USE_MYSQLND
ZVAL_COPY(&stmt->link_handle, mysql_link); ZVAL_COPY(&stmt->link_handle, mysql_link);
#endif #endif
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE)); mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
mysqli_resource->ptr = (void *)stmt; mysqli_resource->ptr = (void *)stmt;
mysqli_resource->status = (ZEND_NUM_ARGS() == 1) ? MYSQLI_STATUS_INITIALIZED : MYSQLI_STATUS_VALID; mysqli_resource->status = MYSQLI_STATUS_INITIALIZED;
MYSQLI_REGISTER_RESOURCE_EX(mysqli_resource, getThis()); MYSQLI_REGISTER_RESOURCE_EX(mysqli_resource, getThis());
if (statement) {
if(mysql_stmt_prepare(stmt->stmt, statement, statement_len)) {
MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
RETURN_FALSE;
}
mysqli_resource->status = MYSQLI_STATUS_VALID;
}
} }
/* }}} */ /* }}} */

13
ext/mysqli/tests/063.phpt
View file

@ -16,9 +16,18 @@ require_once('skipifconnectfailure.inc');
$stmt->bind_result($foo); $stmt->bind_result($foo);
$stmt->fetch(); $stmt->fetch();
$stmt->close(); $stmt->close();
$mysql->close();
var_dump($foo); var_dump($foo);
mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
try {
// an exception should be thrown from prepare (i.e. constructor) not from execute
$stmt = new mysqli_stmt($mysql, "SELECT invalid FROM DUAL");
} catch(mysqli_sql_exception $e) {
echo $e->getMessage()."\n";
}
$mysql->close();
?> ?>
--EXPECT-- --EXPECT--
string(3) "foo" string(3) "foo"
Unknown column 'invalid' in 'field list'