MFH

tony2001 · tony2001 · commit 46a6bd7f9dec · 2006-12-28T13:30:25.000Z
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
@@ -235,9 +235,9 @@ PHP_MINFO_FUNCTION(apache)
 		if ((p = strrchr(name, '.'))) {
 			*p='\0'; /* Cut off ugly .c extensions on module names */
 		}
-		strcat(modulenames, name);
+		strlcat(modulenames, name, sizeof(modulenames));
 		if (modp->next) {
-			strcat(modulenames, ", ");
+			strlcat(modulenames, ", ", sizeof(modulenames));
 		}
 	}
 	php_info_print_table_row(2, "Loaded Modules", modulenames);
diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
@@ -1637,9 +1637,9 @@ PHP_MINFO_FUNCTION(apache)
 		if ((p = strrchr(name, '.'))) {
 			*p='\0'; /* Cut off ugly .c extensions on module names */
 		}
-		strcat(modulenames, name);
+		strlcat(modulenames, name, sizeof(modulenames));
 		if (modp->next) {
-			strcat(modulenames, ", ");
+			strlcat(modulenames, ", ", sizeof(modulenames));
 		}
 	}
 	php_info_print_table_row(2, "Loaded Modules", modulenames);

Original file line number	Diff line number	Diff line change
`@@ -235,9 +235,9 @@ PHP_MINFO_FUNCTION(apache)`
`235`	`235`	`if ((p = strrchr(name, '.'))) {`
`236`	`236`	`p='\0'; / Cut off ugly .c extensions on module names */`
`237`	`237`	`}`
`238`		`- strcat(modulenames, name);`
	`238`	`+ strlcat(modulenames, name, sizeof(modulenames));`
`239`	`239`	`if (modp->next) {`
`240`		`- strcat(modulenames, ", ");`
	`240`	`+ strlcat(modulenames, ", ", sizeof(modulenames));`
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`	`php_info_print_table_row(2, "Loaded Modules", modulenames);`
Original file line number	Diff line number	Diff line change
`@@ -1637,9 +1637,9 @@ PHP_MINFO_FUNCTION(apache)`
`1637`	`1637`	`if ((p = strrchr(name, '.'))) {`
`1638`	`1638`	`p='\0'; / Cut off ugly .c extensions on module names */`
`1639`	`1639`	`}`
`1640`		`- strcat(modulenames, name);`
	`1640`	`+ strlcat(modulenames, name, sizeof(modulenames));`
`1641`	`1641`	`if (modp->next) {`
`1642`		`- strcat(modulenames, ", ");`
	`1642`	`+ strlcat(modulenames, ", ", sizeof(modulenames));`
`1643`	`1643`	`}`
`1644`	`1644`	`}`
`1645`	`1645`	`php_info_print_table_row(2, "Loaded Modules", modulenames);`