Fix $i could be affected by the socket settings not being of the same length

williamdes · williamdes · commit 12b0f347cb93 · 2025-01-03T23:56:43.000+01:00
"Looping through $sockets using the same index variable $i interferes with $i--; on the following line. PMA_HOSTS &amp; PMA_SOCKETS may not be of equal length."
diff --git a/config.inc.php b/config.inc.php
@@ -135,9 +135,10 @@
     $cfg['Servers'][$i]['compress'] = false;
     $cfg['Servers'][$i]['AllowNoPassword'] = true;
 }
-for ($i = 1; isset($sockets[$i - 1]); $i++) {
-    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
-    $cfg['Servers'][$i]['host'] = 'localhost';
+// Avoid overwriting the last server id $i, use another variable name
+for ($socketHostId = 1; isset($sockets[$socketHostId - 1]); $socketHostId++) {
+    $cfg['Servers'][$socketHostId]['socket'] = $sockets[$socketHostId - 1];
+    $cfg['Servers'][$socketHostId]['host'] = 'localhost';
 }
 /*
  * Revert back to last configured server to make

Original file line number	Diff line number	Diff line change
`@@ -135,9 +135,10 @@`
`135`	`135`	`$cfg['Servers'][$i]['compress'] = false;`
`136`	`136`	`$cfg['Servers'][$i]['AllowNoPassword'] = true;`
`137`	`137`	`}`
`138`		`-for ($i = 1; isset($sockets[$i - 1]); $i++) {`
`139`		`- $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];`
`140`		`- $cfg['Servers'][$i]['host'] = 'localhost';`
	`138`	`+// Avoid overwriting the last server id $i, use another variable name`
	`139`	`+for ($socketHostId = 1; isset($sockets[$socketHostId - 1]); $socketHostId++) {`
	`140`	`+ $cfg['Servers'][$socketHostId]['socket'] = $sockets[$socketHostId - 1];`
	`141`	`+ $cfg['Servers'][$socketHostId]['host'] = 'localhost';`
`141`	`142`	`}`
`142`	`143`	`/*`
`143`	`144`	`* Revert back to last configured server to make`