archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1' into PHP-8.2

Browse source
This commit is contained in:
Stanislav Malyshev 2022-12-18 23:21:25 -07:00
commit 32b6eacbc6
4 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/pdo/pdo_dbh.c
View file

@ -1164,7 +1164,7 @@ PHP_METHOD(PDO, query)
PHP_METHOD(PDO, quote)
{
pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS);
zend_string *str;
zend_string *str, *quoted;
zend_long paramtype = PDO_PARAM_STR;
ZEND_PARSE_PARAMETERS_START(1, 2)
@ -1180,8 +1180,14 @@ PHP_METHOD(PDO, quote)
pdo_raise_impl_error(dbh, NULL, "IM001", "driver does not support quoting");
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) {
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 {
pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource");
ret = -1;

6
ext/pdo_sqlite/sqlite_driver.c
View file

@ -226,7 +226,11 @@ static zend_string *pdo_sqlite_last_insert_id(pdo_dbh_t *dbh, const zend_string
/* NB: doesn't handle binary strings... use prepared stmts for that */
static zend_string* sqlite_handle_quoter(pdo_dbh_t *dbh, const zend_string *unquoted, enum pdo_param_type paramtype)
{
char *quoted = safe_emalloc(2, ZSTR_LEN(unquoted), 3);
char *quoted;
if (ZSTR_LEN(unquoted) > (INT_MAX - 3) / 2) {
return NULL;
}
quoted = safe_emalloc(2, ZSTR_LEN(unquoted), 3);
/* TODO use %Q format? */
sqlite3_snprintf(2*ZSTR_LEN(unquoted) + 3, quoted, "'%q'", ZSTR_VAL(unquoted));
zend_string *quoted_str = zend_string_init(quoted, strlen(quoted), 0);

17
ext/pdo_sqlite/tests/bug81740.phpt Normal file
View file

@ -0,0 +1,17 @@
--TEST--
Bug #81740 (PDO::quote() may return unquoted string)
--SKIPIF--
<?php
if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
?>
--INI--
memory_limit=-1
--FILE--
<?php
$pdo = new PDO("sqlite::memory:");
$string = str_repeat("a", 0x80000000);
var_dump($pdo->quote($string));
?>
--EXPECT--
bool(false)