From fffd63f3c7be0237fe745cdb0eabb3eda3704912 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Fri, 13 Aug 2021 10:57:19 -0700
Subject: [PATCH] Applied mask to pdo quote for binary inputs (#1288)

---
 source/pdo_sqlsrv/pdo_dbh.cpp | 16 +++++++++++-----
 source/sqlsrv/conn.cpp        |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/source/pdo_sqlsrv/pdo_dbh.cpp b/source/pdo_sqlsrv/pdo_dbh.cpp
index 46e72670..0a12576b 100644
--- a/source/pdo_sqlsrv/pdo_dbh.cpp
+++ b/source/pdo_sqlsrv/pdo_dbh.cpp
@@ -510,12 +510,17 @@ struct pdo_dbh_methods pdo_sqlsrv_dbh_methods = {
     pdo_sqlsrv_dbh_last_id,
     pdo_sqlsrv_dbh_return_error,
     pdo_sqlsrv_dbh_get_attr,
-    NULL,                           // check liveness not implemented
+    NULL,                               // check liveness not implemented
     pdo_sqlsrv_get_driver_methods,
-    NULL,                            // request shutdown not implemented
-    NULL                             // in transaction not implemented
+    NULL,                               // request shutdown not implemented
+#if PHP_VERSION_ID < 80100
+    NULL                                // in transaction not implemented
 };
-
+#else
+    NULL,                               // in transaction not implemented
+    NULL                                // get_gc not implemented
+};
+#endif
 
 // log a function entry point
 #define PDO_LOG_DBH_ENTRY \
@@ -1723,7 +1728,8 @@ zend_string* pdo_sqlsrv_dbh_quote(_Inout_ pdo_dbh_t* dbh, _In_ const zend_string
             // On failure, a negative number is returned
             // The generated string has a length of at most len - 1, so 
             // len is 3 (2 hex digits + 1)
-            int n = snprintf((char*)(*quoted + pos), 3, "%02X", unquoted[index]);
+            // Requires "& 0x000000FF", or snprintf will translate "0x90" to "0xFFFFFF90"
+            int n = snprintf((char*)(*quoted + pos), 3, "%02X", unquoted[index] & 0x000000FF);
             if (n < 0) {
                 // Something went wrong, simply return 0 (failure)
                 return 0;
diff --git a/source/sqlsrv/conn.cpp b/source/sqlsrv/conn.cpp
index a6ae7a57..4da70d31 100644
--- a/source/sqlsrv/conn.cpp
+++ b/source/sqlsrv/conn.cpp
@@ -122,7 +122,7 @@ struct int_conn_str_func {
 
         char temp_str[MAX_CONN_VALSTRING_LEN];
 
-        snprintf(temp_str, MAX_CONN_VALSTRING_LEN, "%s={%d};", option->odbc_name, Z_LVAL_P(value));
+        snprintf(temp_str, MAX_CONN_VALSTRING_LEN, "%s={%ld};", option->odbc_name, Z_LVAL_P(value));
         conn_str += temp_str;
     }
 };