From 340d21a1e03de0961df70a589b973bf4ff331a1b Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Wed, 17 Mar 2010 04:22:52 +0000
Subject: [PATCH] iniGet/ReadNamedStringList() now return NULL if there are no
 keys in the specified section or the section does not exist.

---
 src/xpdev/ini_file.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/xpdev/ini_file.c b/src/xpdev/ini_file.c
index c2653f22cd..b6b5ff000d 100644
--- a/src/xpdev/ini_file.c
+++ b/src/xpdev/ini_file.c
@@ -998,14 +998,9 @@ iniReadNamedStringList(FILE* fp, const char* section)
 	char*	value;
 	char	str[INI_MAX_LINE_LEN];
 	ulong	items=0;
-	named_string_t** lp;
+	named_string_t** lp=NULL;
 	named_string_t** np;
 
-	if((lp=(named_string_t**)malloc(sizeof(named_string_t*)))==NULL)
-		return(NULL);
-
-	*lp=NULL;
-
 	if(fp==NULL)
 		return(lp);
 
@@ -1035,7 +1030,8 @@ iniReadNamedStringList(FILE* fp, const char* section)
 		items++;
 	}
 
-	lp[items]=NULL;	/* terminate list */
+	if(items)
+		lp[items]=NULL;	/* terminate list */
 
 	return(lp);
 }
@@ -1047,14 +1043,9 @@ iniGetNamedStringList(str_list_t list, const char* section)
 	char*	value;
 	char	str[INI_MAX_LINE_LEN];
 	ulong	i,items=0;
-	named_string_t** lp;
+	named_string_t** lp=NULL;
 	named_string_t** np;
 
-	if((lp=(named_string_t**)malloc(sizeof(named_string_t*)))==NULL)
-		return(NULL);
-
-	*lp=NULL;
-
 	if(list==NULL)
 		return(lp);
 
@@ -1078,7 +1069,8 @@ iniGetNamedStringList(str_list_t list, const char* section)
 		items++;
 	}
 
-	lp[items]=NULL;	/* terminate list */
+	if(items)
+		lp[items]=NULL;	/* terminate list */
 
 	return(lp);
 }
-- 
GitLab