From bf550fe8da6d9c302b64bdb1ff308ee989bd4fd3 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Sun, 6 Dec 2009 19:34:12 +0000 Subject: [PATCH] Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN). --- NEWS | 1 + ext/pdo/pdo.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 0f212f6761..438d62473d 100644 --- a/NEWS +++ b/NEWS @@ -33,6 +33,7 @@ PHP NEWS - Fixed bug #50345 (nanosleep not detected properly on some solaris versions). (Jani) - Fixed bug #50340 (php.ini parser does not allow spaces in ini keys). (Jani) +- Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN). (Ilia) - Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays). (Felipe) - Fixed bug #50282 (xmlrpc_encode_request() changes object into array in diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 3ecc46e14a..e986aaa225 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -245,7 +245,7 @@ PDO_API int php_pdo_parse_data_source(const char *data_source, semi = i++; break; } - if (data_source[i] == ';') { + if (data_source[i] == ';' && ((i + 1 >= data_source_len) || data_source[i+1] != ';')) { semi = i++; break; } -- 2.40.0