diff options
| author | Remi Collet <remi@remirepo.net> | 2024-11-13 08:22:31 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-11-13 08:22:31 +0100 |
| commit | e1a245a0066008cda88f910f2b84e33dbc4c9b61 (patch) | |
| tree | a9d609be72ac94f012335794d63004e080d47fb1 /php-bug81740.patch | |
| parent | 3e542feeac8e065151836f1bb5fd8c0e66c7f18f (diff) | |
Diffstat (limited to 'php-bug81740.patch')
| -rw-r--r-- | php-bug81740.patch | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/php-bug81740.patch b/php-bug81740.patch deleted file mode 100644 index 4826efc..0000000 --- a/php-bug81740.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 7cb160efe19d3dfb8b92629805733ea186b55050 Mon Sep 17 00:00:00 2001 -From: "Christoph M. Becker" <cmbecker69@gmx.de> -Date: Mon, 31 Oct 2022 17:20:23 +0100 -Subject: [PATCH 1/2] Fix #81740: PDO::quote() may return unquoted string - -`sqlite3_snprintf()` expects its first parameter to be `int`; we need -to avoid overflow. - -(cherry picked from commit 921b6813da3237a83e908998483f46ae3d8bacba) ---- - ext/pdo_sqlite/sqlite_driver.c | 3 +++ - ext/pdo_sqlite/tests/bug81740.phpt | 17 +++++++++++++++++ - 2 files changed, 20 insertions(+) - create mode 100644 ext/pdo_sqlite/tests/bug81740.phpt - -diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c -index 0595bd09feb..54f9d05e1e2 100644 ---- a/ext/pdo_sqlite/sqlite_driver.c -+++ b/ext/pdo_sqlite/sqlite_driver.c -@@ -233,6 +233,9 @@ static char *pdo_sqlite_last_insert_id(pdo_dbh_t *dbh, const char *name, size_t - /* NB: doesn't handle binary strings... use prepared stmts for that */ - static int sqlite_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unquotedlen, char **quoted, size_t *quotedlen, enum pdo_param_type paramtype ) - { -+ if (unquotedlen > (INT_MAX - 3) / 2) { -+ return 0; -+ } - *quoted = safe_emalloc(2, unquotedlen, 3); - sqlite3_snprintf(2*unquotedlen + 3, *quoted, "'%q'", unquoted); - *quotedlen = strlen(*quoted); -diff --git a/ext/pdo_sqlite/tests/bug81740.phpt b/ext/pdo_sqlite/tests/bug81740.phpt -new file mode 100644 -index 00000000000..99fb07c3048 ---- /dev/null -+++ b/ext/pdo_sqlite/tests/bug81740.phpt -@@ -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) --- -2.38.1 - -From 7328f3a0344806b846bd05657bdce96e47810bf0 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 19 Dec 2022 09:24:02 +0100 -Subject: [PATCH 2/2] NEWS - ---- - NEWS | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/NEWS b/NEWS -index 8a8c0c9285d..03e8c839c77 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,5 +1,12 @@ - PHP NEWS - ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -+ -+Backported from 8.0.27 -+ -+- PDO/SQLite: -+ . Fixed bug #81740 (PDO::quote() may return unquoted string). -+ (CVE-2022-31631) (cmb) -+ - 03 Nov 2022, PHP 7.4.33 - - - GD: --- -2.38.1 - |