bugfix: segfault on startup when modules using MSG_PASSING mode are used

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7825cc7c..8c762c61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---------------------------------------------------------------------------
 Version 7.3.2  [devel] 2012-10-??
 - permited action-like statements (stop, call, ...) in action lists
+- bugfix: segfault on startup when modules using MSG_PASSING mode are used
 ---------------------------------------------------------------------------
 Version 7.3.1  [devel] 2012-10-19
 - optimized template processing performance, especially for $NOW family
diff --git a/action.c b/action.c
index cf010d01..33580f7f 100644
--- a/action.c
+++ b/action.c
@@ -1890,13 +1890,16 @@ actionRequiresDateCall(action_t *pAction)
 	int i;
 	int r = 0;
 
+	if(pAction->eParamPassing == ACT_MSG_PASSING)
+		/* in msg passing mode, we have NO templates! */
+		goto done;
 	for(i = 0 ; i < pAction->iNumTpls ; ++i) {
 		if(tplRequiresDateCall(pAction->ppTpl[i])) {
 			r = 1;
 			break;
 		}
 	}
-	return r;
+done:	return r;
 }