Fix #80115: mysqlnd.debug doesn't recognize absolute paths with slashes

cmb69 · cmb69 · commit efdbc3688bd9 · 2020-09-17T12:37:02.000+02:00
diff --git a/NEWS b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 7.3.24
 
+- MySQLnd:
+  . Fixed bug #80115 (mysqlnd.debug doesn't recognize absolute paths with
+    slashes). (cmb)
+
 - OPcache:
   . Fixed bug #80083 (Optimizer pass 6 removes variables used for ibm_db2 data
     binding). (Nikita)
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c
@@ -524,7 +524,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const
 				if (i + 1 < mode_len && mode[i+1] == ',') {
 					unsigned int j = i + 2;
 #ifdef PHP_WIN32
-					if (i+4 < mode_len && mode[i+3] == ':' && (mode[i+4] == '\\' || mode[i+5] == '/')) {
+					if (i+4 < mode_len && mode[i+3] == ':' && (mode[i+4] == '\\' || mode[i+4] == '/')) {
 						j = i + 5;
 					}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const`
`524`	`524`	`if (i + 1 < mode_len && mode[i+1] == ',') {`
`525`	`525`	`unsigned int j = i + 2;`
`526`	`526`	`#ifdef PHP_WIN32`
`527`		`- if (i+4 < mode_len && mode[i+3] == ':' && (mode[i+4] == '\\' \|\| mode[i+5] == '/')) {`
	`527`	`+ if (i+4 < mode_len && mode[i+3] == ':' && (mode[i+4] == '\\' \|\| mode[i+4] == '/')) {`
`528`	`528`	`j = i + 5;`
`529`	`529`	`}`
`530`	`530`	`#endif`