From 80d876b4f8d57b3b46c3d61cc6e8acb937820839 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 20 Dec 2022 08:46:49 +0100
Subject: pdo: fix #81740: PDO::quote() may return unquoted string

  CVE-2022-31631
use oracle client library version 21.8
---
 php-bug81740.patch | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 php70.spec         | 13 ++++++--
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 php-bug81740.patch

diff --git a/php-bug81740.patch b/php-bug81740.patch
new file mode 100644
index 0000000..5962dd9
--- /dev/null
+++ b/php-bug81740.patch
@@ -0,0 +1,87 @@
+From dad5b771fba02359facd7be0cd2fd0896cdc91ae 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)
+(cherry picked from commit 7cb160efe19d3dfb8b92629805733ea186b55050)
+---
+ 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 481b62de97..56d15ae2c0 100644
+--- a/ext/pdo_sqlite/sqlite_driver.c
++++ b/ext/pdo_sqlite/sqlite_driver.c
+@@ -232,6 +232,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 0000000000..99fb07c304
+--- /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 3a800d9c39caca74158a0aa7a2e268cb5ebac701 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
+
+(cherry picked from commit 7328f3a0344806b846bd05657bdce96e47810bf0)
+(cherry picked from commit dbfbd99e91701c0a5613133c06305fd70545e9ad)
+---
+ NEWS | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/NEWS b/NEWS
+index eded1b91d6..b7d4bf3082 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,6 +1,12 @@
+ PHP                                                                        NEWS
+ |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+ 
++Backported from 8.0.27
++
++- PDO/SQLite:
++  . Fixed bug #81740 (PDO::quote() may return unquoted string).
++    (CVE-2022-31631) (cmb)
++
+ Backported from 7.4.32
+ 
+ - Core:
+-- 
+2.38.1
+
diff --git a/php70.spec b/php70.spec
index 4041fde..2b7a3cd 100644
--- a/php70.spec
+++ b/php70.spec
@@ -26,7 +26,7 @@
 
 %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
 
-%global oraclever 21.7
+%global oraclever 21.8
 %global oraclelib 21.1
 
 # Build for LiteSpeed Web Server (LSAPI)
@@ -109,7 +109,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 35%{?dist}
+Release: 36%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -227,6 +227,7 @@ Patch255: php-bug81719.patch
 Patch256: php-bug81720.patch
 Patch257: php-bug81727.patch
 Patch258: php-bug81726.patch
+Patch259: php-bug81740.patch
 
 # Fixes for tests (300+)
 # Factory is droped from system tzdata
@@ -1140,6 +1141,7 @@ echo CIBLE = %{name}-%{version}-%{release} oci8=%{with_oci8} libzip=%{with_libzi
 %patch256 -p1 -b .bug81720
 %patch257 -p1 -b .bug81727
 %patch258 -p1 -b .bug81726
+%patch259 -p1 -b .bug81740
 
 # Fixes for tests
 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 5
@@ -1937,7 +1939,7 @@ cat << EOF
 
   WARNING : PHP 7.0 have reached its "End of Life" in
   December 2018. Even, if this package includes some of
-  the important security fix, backported from 7.4, the
+  the important security fixes, backported from 8.0, the
   UPGRADE to a maintained version is very strongly RECOMMENDED.
 
 =====================================================================
@@ -2177,6 +2179,11 @@ fi
 
 
 %changelog
+* Tue Dec 20 2022 Remi Collet <remi@remirepo.net> - 7.0.33-36
+- pdo: fix #81740: PDO::quote() may return unquoted string
+  CVE-2022-31631
+- use oracle client library version 21.8
+
 * Tue Sep 27 2022 Remi Collet <remi@remirepo.net> - 7.0.33-35
 - phar: fix #81726 DOS when using quine gzip file. CVE-2022-31628
 - core: fix #81727 Don't mangle HTTP variable names that clash with ones
-- 
cgit