diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 12:58:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 12:58:32 +0100 |
| commit | 2a813afa41cfda63896002b037742a67678584ad (patch) | |
| tree | 3b27af879f8e87fb5b60204ecdd512cb15803556 /plugins/omprog/omprog.c | |
| parent | 1ae52ee0e386ee7991d65cd2ac46add2b84f3099 (diff) | |
| parent | 8716e36b12a851cbe6a8a3949dfdcad31aa5fc37 (diff) | |
| download | rsyslog-2a813afa41cfda63896002b037742a67678584ad.tar.gz rsyslog-2a813afa41cfda63896002b037742a67678584ad.tar.xz rsyslog-2a813afa41cfda63896002b037742a67678584ad.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
plugins/omprog/omprog.c
runtime/rsyslog.h
Diffstat (limited to 'plugins/omprog/omprog.c')
| -rw-r--r-- | plugins/omprog/omprog.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/omprog/omprog.c b/plugins/omprog/omprog.c index c4be3076..ae086a14 100644 --- a/plugins/omprog/omprog.c +++ b/plugins/omprog/omprog.c @@ -310,6 +310,12 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) p += sizeof(":omprog:") - 1; /* eat indicator sequence (-1 because of '\0'!) */ 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) == ';') |