forgot about PDO::ERRMODE_SILENT

Author: divinity76

ext/pdo_sqlite/sqlite_driver.c

@@ -28,6 +28,14 @@
 #include "zend_exceptions.h"
 #include "sqlite_driver_arginfo.h"
 
+/*
+ * Updated to add support for PDO::ERRMODE_SILENT and PDO::ERRMODE_WARNING
+ * in addition to PDO::ERRMODE_EXCEPTION. The error mode is stored in
+ * dbh->error_mode (assumed to be part of pdo_dbh_t) and is set in the
+ * handle factory. Depending on the error mode, errors either throw an
+ * exception, emit a warning, or remain silent.
+ */
+
 int _pdo_sqlite_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int line) /* {{{ */
 {
 	pdo_sqlite_db_handle *H = (pdo_sqlite_db_handle *)dbh->driver_data;
@@ -74,8 +82,11 @@ int _pdo_sqlite_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *file, int li
 			break;
 	}
 
-	if (!dbh->methods) {
-		pdo_throw_exception(einfo->errcode, einfo->errmsg, pdo_err);
+	/* Handle error based on error mode */
+	if (dbh->error_mode == PDO_ERRMODE_EXCEPTION) {
+		zend_throw_exception_ex(php_pdo_get_exception(), einfo->errcode, "%s", einfo->errmsg);
+	} else if (dbh->error_mode == PDO_ERRMODE_WARNING) {
+		php_error_docref(NULL, E_WARNING, "%s", einfo->errmsg);
 	}
 
 	return einfo->errcode;
@@ -227,8 +238,12 @@ static zend_string* sqlite_handle_quoter(pdo_dbh_t *dbh, const zend_string *unqu
 		return NULL;
 	}
 	if(memchr(ZSTR_VAL(unquoted), '\0', ZSTR_LEN(unquoted)) != NULL) {
-		zend_throw_exception_ex(php_pdo_get_exception(), 0,
-			"SQLite PDO::quote does not support NULL bytes");
+		if (dbh->error_mode == PDO_ERRMODE_EXCEPTION) {
+			zend_throw_exception_ex(php_pdo_get_exception(), 0,
+				"SQLite PDO::quote does not support NULL bytes");
+		} else if (dbh->error_mode == PDO_ERRMODE_WARNING) {
+			php_error_docref(NULL, E_WARNING, "SQLite PDO::quote does not support NULL bytes");
+		}
 		return NULL;
 	}
 	quoted = safe_emalloc(2, ZSTR_LEN(unquoted), 3);
@@ -842,6 +857,14 @@ static int pdo_sqlite_handle_factory(pdo_dbh_t *dbh, zval *driver_options) /* {{
 	if (driver_options) {
 		timeout = pdo_attr_lval(driver_options, PDO_ATTR_TIMEOUT, timeout);
 	}
+	
+	/* Set the error mode attribute based on driver options, defaulting to ERRMODE_EXCEPTION */
+	if (driver_options) {
+		dbh->error_mode = pdo_attr_lval(driver_options, PDO_ATTR_ERRMODE, PDO_ERRMODE_EXCEPTION);
+	} else {
+		dbh->error_mode = PDO_ERRMODE_EXCEPTION;
+	}
+
 	sqlite3_busy_timeout(H->db, timeout * 1000);
 
 	dbh->alloc_own_columns = 1;

ext/pdo_sqlite/tests/gh13952.phpt

@@ -1,15 +1,16 @@
 --TEST--
-GH-13952 (sqlite PDO::quote silently corrupts strings with null bytes)
+GH-13952 (sqlite PDO::quote handles null bytes correctly)
 --EXTENSIONS--
 pdo
 pdo_sqlite
 --FILE--
 <?php
-$db = new \PDO('sqlite::memory:', null, null, [
-    \PDO::ATTR_ERRMODE            => \PDO::ERRMODE_EXCEPTION,
-    \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
-    \PDO::ATTR_EMULATE_PREPARES   => false,
-]);
+
+$modes = [
+    'exception' => PDO::ERRMODE_EXCEPTION,
+    'warning'   => PDO::ERRMODE_WARNING,
+    'silent'    => PDO::ERRMODE_SILENT,
+];
 
 $test_cases = [
     "",
@@ -26,34 +27,53 @@ $test_cases = [
     "\x00foo\x00\x00\x00bar\x00",
     "\x00\x00\x00foo",
     "foo\x00\x00\x00",
-    "\x80",       // Invalid UTF-8 sequence
-    "\x00\x80\x00", // Invalid UTF-8 sequence with null bytes
+    "\x80", // << invalid UTF-8
+    "\x00\x80\x00", // << invalid UTF-8 with null bytes
 ];
 
-foreach ($test_cases as $test) {
-    $should_throw = str_contains($test, "\x00");
-    try {
-        $quoted = $db->quote($test);
-        if ($should_throw) {
-            $displayTest = var_export($test, true);
-            throw new LogicException("Failed for {$displayTest}: expected an exception but none was thrown.");
-        }
-    } catch (\PDOException $e) {
-        if (!$should_throw) {
-            $displayTest = var_export($test, true);
-            throw new LogicException("Failed for {$displayTest}: unexpected exception thrown.", 0, $e);
+foreach ($modes as $mode_name => $mode) {
+    echo "Testing error mode: $mode_name\n";
+    $db = new PDO('sqlite::memory:', null, null, [PDO::ATTR_ERRMODE => $mode]);
+
+    foreach ($test_cases as $test) {
+        $contains_null = str_contains($test, "\x00");
+
+        if ($mode === PDO::ERRMODE_EXCEPTION && $contains_null) {
+            set_error_handler(fn() => throw new PDOException(), E_WARNING);
+            try {
+                $db->quote($test);
+                throw new LogicException("Expected exception not thrown.");
+            } catch (PDOException) {
+                // expected
+            } finally {
+                restore_error_handler();
+            }
+        } else {
+            set_error_handler(fn() => null, E_WARNING);
+            $quoted = $db->quote($test);
+            restore_error_handler();
+
+            if ($contains_null) {
+                if ($quoted !== false) {
+                    throw new LogicException("Expected false, got: " . var_export($quoted, true));
+                }
+            } else {
+                if ($quoted === false) {
+                    throw new LogicException("Unexpected false from quote().");
+                }
+                $fetched = $db->query("SELECT $quoted")->fetchColumn();
+                if ($fetched !== $test) {
+                    throw new LogicException("Data corrupted: expected " . var_export($test, true) . " got " . var_export($fetched, true));
+                }
+            }
         }
-        // Exception is expected
-        continue;
-    }
-    $fetched = $db->query("SELECT $quoted")->fetch($db::FETCH_NUM)[0];
-    if ($fetched !== $test) {
-        $displayTest = var_export($test, true);
-        $displayFetched = var_export($fetched, true);
-        throw new LogicException("Round-trip data corruption for {$displayTest}: got {$displayFetched}.");
     }
 }
+
 echo "ok\n";
 ?>
 --EXPECT--
+Testing error mode: exception
+Testing error mode: warning
+Testing error mode: silent
 ok