Merge branch 'v7-stable'

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8cf18856..8ab819c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -287,6 +287,9 @@ Version 7.3.0  [devel] 2012-10-09
   This is controlled by the new action parameter "VeryReliableZip".
 ----------------------------------------------------------------------------
 Version 7.2.8  [v7-stable] 2013-0?-??
+- bugfix: potential segfault on startup when builtin module was specified
+  in module() statement.
+  Thanks to Marius Tomaschewski for reporting the bug.
 - bugfix: segfault due to invalid dynafile cache handling
   Accidently, the old-style cache size parameter was used when the
   dynafile cache was created in a RainerScript action. If the old-style
diff --git a/runtime/modules.c b/runtime/modules.c
index e9d8d959..56606306 100644
--- a/runtime/modules.c
+++ b/runtime/modules.c
@@ -1045,7 +1045,6 @@ Load(uchar *pModName, sbool bConfLoad, struct nvlst *lst)
 		if(bConfLoad) {
 			localRet = readyModForCnf(pModInfo, &pNew, &pLast);
 			if(pModInfo->setModCnf != NULL && localRet == RS_RET_OK) {
-				addModToCnfList(pNew, pLast);
 				if(!strncmp((char*)pModName, "builtin:", sizeof("builtin:")-1)) {
 					if(pModInfo->bSetModCnfCalled) {
 						errmsg.LogError(0, RS_RET_DUP_PARAM,
@@ -1061,6 +1060,11 @@ Load(uchar *pModName, sbool bConfLoad, struct nvlst *lst)
 							pModInfo->setModCnf(lst);
 						pModInfo->bSetModCnfCalled = 1;
 					}
+				} else {
+					/* regular modules need to be added to conf list (for
+					 * builtins, this happend during initial load).
+					 */
+					addModToCnfList(pNew, pLast);
 				}
 			}
 		}