From c21c2da229a96a0b260a191a77a827026c5f8a5c 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 4370736e44..2a502d7295 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ PHP NEWS - Fixed bug #50345 (nanosleep not detected properly on some solaris versions). (Jani) +- Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN). (Ilia) - Fixed bug #50266 (conflicting types for llabs). (Jani) - Fixed bug #50168 (FastCGI fails with wrong error on HEAD request to non-existent file). (Dmitry) diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 048809775d..3187543187 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -240,7 +240,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.50.1