com php-src: Fix #71943: dblib_handle_quoter needs to allocate an extra byte: ext/pdo_dblib/dblib_dr iver.c ext/pdo_dblib/tests/pdo_dblib_quote.phpt
| From: | Anatol Belski | Date: | Mon, 04 Apr 2016 15:33:49 +0000 |
| Subject: | com php-src: Fix #71943: dblib_handle_quoter needs to allocate an extra byte: ext/pdo_dblib/dblib_dr iver.c ext/pdo_dblib/tests/pdo_dblib_quote.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91596@lists.php.net to get a copy of this message | ||
Commit: 9fcfc18ca9a38ed318f8a7026c0eda27aed79f28
Author: Adam Baratz <adam.baratz@gmail.com> Fri, 1 Apr 2016 11:23:35 -0400
Committer: Anatol Belski <ab@php.net> Mon, 4 Apr 2016 17:33:49 +0200
Parents: 9a65c69c628462620c2c378658fa6ae11bf1bea7
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9fcfc18ca9a38ed318f8a7026c0eda27aed79f28
Log:
Fix #71943: dblib_handle_quoter needs to allocate an extra byte
Bugs:
https://bugs.php.net/71943
Changed paths:
M ext/pdo_dblib/dblib_driver.c
A ext/pdo_dblib/tests/pdo_dblib_quote.phpt
Diff:
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index dcbaf55..9937466 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -170,7 +170,7 @@ static int dblib_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unqu
*
*/
*quotedlen = (unquotedlen * 2) + 2; /* 2 chars per byte +2 for "0x" prefix */
- q = *quoted = emalloc(*quotedlen);
+ q = *quoted = emalloc(*quotedlen+1); /* Add byte for terminal null */
*q++ = '0';
*q++ = 'x';
@@ -181,7 +181,7 @@ static int dblib_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t unqu
} else {
/* Alpha/Numeric Quoting */
*quotedlen += 2; /* +2 for opening, closing quotes */
- q = *quoted = emalloc(*quotedlen);
+ q = *quoted = emalloc(*quotedlen+1); /* Add byte for terminal null */
*q++ = '\'';
for (i=0;i<unquotedlen;i++) {
diff --git a/ext/pdo_dblib/tests/pdo_dblib_quote.phpt b/ext/pdo_dblib/tests/pdo_dblib_quote.phpt
new file mode 100644
index 0000000..24a36de
--- /dev/null
+++ b/ext/pdo_dblib/tests/pdo_dblib_quote.phpt
@@ -0,0 +1,24 @@
+--TEST--
+PDO_DBLIB: Ensure quote function returns expected results
+--SKIPIF--
+<?php
+if (!extension_loaded('pdo_dblib')) die('skip not loaded');
+require dirname(__FILE__) . '/config.inc';
+?>
+--FILE--
+<?php
+require dirname(__FILE__) . '/config.inc';
+var_dump($db->quote(true, PDO::PARAM_BOOL));
+var_dump($db->quote(false, PDO::PARAM_BOOL));
+var_dump($db->quote(42, PDO::PARAM_INT));
+var_dump($db->quote(null, PDO::PARAM_NULL));
+var_dump($db->quote('\'', PDO::PARAM_STR));
+var_dump($db->quote('foo', PDO::PARAM_STR));
+?>
+--EXPECT--
+string(3) "'1'"
+string(2) "''"
+string(4) "'42'"
+string(2) "''"
+string(4) "''''"
+string(5) "'foo'"