From: Derick Rethans <derick@php.net>
Date: Mon, 16 Feb 2004 14:29:07 +0000 (+0000)
Subject: - MFH: Fixed zero bytes memory allocation when no extra ini files are found in
X-Git-Tag: php-4.3.5RC3~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fe16812bdf6134760d1536ddbe7d62b7cd90a1c;p=php

- MFH: Fixed zero bytes memory allocation when no extra ini files are found in
  the --with-config-file-scan-dir specified directory. (Eric Colinet, Derick)
---

diff --git a/main/php_ini.c b/main/php_ini.c
index c30818965b..02ab926363 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -441,12 +441,14 @@ int php_init_config()
 			 * Don't need an extra byte for the \0 in this malloc as the last
 			 * element will not get a trailing , which gives us the byte for the \0
 			 */
-			php_ini_scanned_files = (char *) malloc(total_l);
-			*php_ini_scanned_files = '\0';
-			for (element = scanned_ini_list.head; element; element = element->next) {
-				strcat(php_ini_scanned_files, *(char **)element->data);		
-				strcat(php_ini_scanned_files, element->next ? ",\n" : "\n");
-			}	
+			if (total_l) {
+				php_ini_scanned_files = (char *) malloc(total_l);
+				*php_ini_scanned_files = '\0';
+				for (element = scanned_ini_list.head; element; element = element->next) {
+					strcat(php_ini_scanned_files, *(char **)element->data);		
+					strcat(php_ini_scanned_files, element->next ? ",\n" : "\n");
+				}	
+			}
 			zend_llist_destroy(&scanned_ini_list);
 		}
 	}