From 3bdeef5733da503ce8e53b8bd1cc8fb06b476c6a Mon Sep 17 00:00:00 2001
From: sv3n <github-sr@hotmail.com>
Date: Tue, 13 Dec 2022 21:18:48 +0100
Subject: [PATCH] Moved null-byte fix from lib/Zend to lib/Magento (#2807)

---
 lib/Magento/Db/Adapter/Pdo/Mysql.php | 5 ++++-
 lib/Zend/Db/Adapter/Pdo/Abstract.php | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/Magento/Db/Adapter/Pdo/Mysql.php b/lib/Magento/Db/Adapter/Pdo/Mysql.php
index b4e0e23b834..8584348b82c 100644
--- a/lib/Magento/Db/Adapter/Pdo/Mysql.php
+++ b/lib/Magento/Db/Adapter/Pdo/Mysql.php
@@ -113,7 +113,10 @@ protected function _quote($value)
             $value = $this->_convertFloat($value);
             return $value;
         }
-
+        // Fix for null-byte injection
+        if (is_string($value)) {
+            $value = addcslashes($value, "\000\032");
+        }
         return parent::_quote($value);
     }
 
diff --git a/lib/Zend/Db/Adapter/Pdo/Abstract.php b/lib/Zend/Db/Adapter/Pdo/Abstract.php
index 8f36fcdaaa9..2c546949f07 100644
--- a/lib/Zend/Db/Adapter/Pdo/Abstract.php
+++ b/lib/Zend/Db/Adapter/Pdo/Abstract.php
@@ -292,10 +292,8 @@ protected function _quote($value)
         if (is_int($value) || is_float($value)) {
             return $value;
         }
-        // Fix for null-byte injection
-        $value = addcslashes($value, "\000\032");
         $this->_connect();
-        return $this->_connection->quote($value);
+        return $this->_connection->quote((string) $value);
     }
 
     /**