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

17 years ago · c21c2da229
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -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)
--- 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;
 			}