clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve fix for bug #81740

Browse Source
This commit is contained in:
Stanislav Malyshev 2022-12-18 23:20:29 -07:00
parent 5975f33c37
commit a6a80eefe0
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/pdo/pdo_dbh.c
View File

@ -1161,7 +1161,7 @@ PHP_METHOD(PDO, query)
PHP_METHOD(PDO, quote) PHP_METHOD(PDO, quote)
{ {
pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS); pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS);
zend_string *str; zend_string *str, *quoted;
zend_long paramtype = PDO_PARAM_STR; zend_long paramtype = PDO_PARAM_STR;
ZEND_PARSE_PARAMETERS_START(1, 2) ZEND_PARSE_PARAMETERS_START(1, 2)
@ -1177,8 +1177,14 @@ PHP_METHOD(PDO, quote)
pdo_raise_impl_error(dbh, NULL, "IM001", "driver does not support quoting"); pdo_raise_impl_error(dbh, NULL, "IM001", "driver does not support quoting");
RETURN_FALSE; RETURN_FALSE;
} }
quoted = dbh->methods->quoter(dbh, str, paramtype);
RETURN_STR(dbh->methods->quoter(dbh, str, paramtype)); if (quoted == NULL) {
PDO_HANDLE_DBH_ERR();
RETURN_FALSE;
}
RETURN_STR(quoted);
} }
/* }}} */ /* }}} */

7
ext/pdo/pdo_sql_parser.re
View File

@ -242,6 +242,13 @@ safe:
if (buf) { if (buf) {
zend_string_release_ex(buf, 0); zend_string_release_ex(buf, 0);
} }
if (plc->quoted == NULL) {
/* bork */
ret = -1;
strncpy(stmt->error_code, stmt->dbh->error_code, 6);
goto clean_up;
}
} else { } else {
pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource"); pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource");
ret = -1; ret = -1;

4
ext/pdo_sqlite/sqlite_driver.c
View File

@ -227,8 +227,8 @@ static zend_string *pdo_sqlite_last_insert_id(pdo_dbh_t *dbh, const zend_string
static zend_string* sqlite_handle_quoter(pdo_dbh_t *dbh, const zend_string *unquoted, enum pdo_param_type paramtype) static zend_string* sqlite_handle_quoter(pdo_dbh_t *dbh, const zend_string *unquoted, enum pdo_param_type paramtype)
{ {
char *quoted; char *quoted;
if (unquotedlen > (INT_MAX - 3) / 2) { if (ZSTR_LEN(unquoted) > (INT_MAX - 3) / 2) {
return 0; return NULL;
} }
quoted = safe_emalloc(2, ZSTR_LEN(unquoted), 3); quoted = safe_emalloc(2, ZSTR_LEN(unquoted), 3);
/* TODO use %Q format? */ /* TODO use %Q format? */