summaryrefslogtreecommitdiffstats
path: root/plugins/omprog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-27 13:52:27 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-27 13:52:27 +0100
commit1773bfa14b271d3bcd7fd96bba0bae8028280b75 (patch)
tree6d0d3eb60c9df2cc364ff612b8f13fab3a25e383 /plugins/omprog
parent99a48039fba51cad2ee6a18a756079fbccab32a2 (diff)
parent2a813afa41cfda63896002b037742a67678584ad (diff)
downloadrsyslog-1773bfa14b271d3bcd7fd96bba0bae8028280b75.tar.gz
rsyslog-1773bfa14b271d3bcd7fd96bba0bae8028280b75.tar.xz
rsyslog-1773bfa14b271d3bcd7fd96bba0bae8028280b75.zip
Merge branch 'v6-stable'
Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h
Diffstat (limited to 'plugins/omprog')
-rw-r--r--plugins/omprog/omprog.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c
index 03252fd5..d71de320 100644
--- a/plugins/omprog/omprog.c
+++ b/plugins/omprog/omprog.c
@@ -375,6 +375,12 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
CHKiRet(createInstance(&pData));
+ if(cs.szBinary == NULL) {
+ errmsg.LogError(0, RS_RET_CONF_RQRD_PARAM_MISSING,
+ "no binary to execute specified");
+ ABORT_FINALIZE(RS_RET_CONF_RQRD_PARAM_MISSING);
+ }
+
CHKmalloc(pData->szBinary = (uchar*) strdup((char*)cs.szBinary));
/* check if a non-standard template is to be applied */
if(*(p-1) == ';')