Fixed bug #50323 (Allow use of ; in values via ;; in PDO DSN).

diff --git a/NEWS b/NEWS
index 0f212f67612d139081de3a4c7794a8b36989c6aa..438d62473d96a4144785140715434901e6684a70 100644 (file)
--- 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 3ecc46e14a77ff7b11de01a0ae489c2ca62bdc56..e986aaa22553d3c2a619d3a4bb6239fd5b6f2848 100755 (executable)
--- 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;
                        }