From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sun, 14 Jan 2007 05:34:32 +0000 (+0000)
Subject: Bug 8803 - Fix crash in API
X-Git-Tag: 1.6.0-beta1~3^2~3483
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=836956f1df6631fe24f6d2f78d68f562b11ecf4d;p=thirdparty%2Fasterisk.git

Bug 8803 - Fix crash in API


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@50784 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/config.c b/main/config.c
index 659cfe0ebb..2acfde86f6 100644
--- a/main/config.c
+++ b/main/config.c
@@ -1317,18 +1317,27 @@ struct ast_config *ast_config_load_with_comments(const char *filename)
 	return result;
 }
 
-struct ast_variable *ast_load_realtime_all(const char *family, ...)
+static struct ast_variable *ast_load_realtime_helper(const char *family, va_list ap)
 {
 	struct ast_config_engine *eng;
 	char db[256]="";
 	char table[256]="";
 	struct ast_variable *res=NULL;
-	va_list ap;
 
-	va_start(ap, family);
 	eng = find_engine(family, db, sizeof(db), table, sizeof(table));
 	if (eng && eng->realtime_func) 
 		res = eng->realtime_func(db, table, ap);
+
+	return res;
+}
+
+struct ast_variable *ast_load_realtime_all(const char *family, ...)
+{
+	struct ast_variable *res;
+	va_list ap;
+
+	va_start(ap, family);
+	res = ast_load_realtime_helper(family, ap);
 	va_end(ap);
 
 	return res;
@@ -1340,7 +1349,7 @@ struct ast_variable *ast_load_realtime(const char *family, ...)
 	va_list ap;
 
 	va_start(ap, family);
-	res = ast_load_realtime_all(family, ap);
+	res = ast_load_realtime_helper(family, ap);
 	va_end(ap);
 
 	/* Eliminate blank entries */