diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-20 09:47:26 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-20 09:47:26 +0100 |
| commit | bdf743197da2e09f303cbd06c708767fe7c6adfd (patch) | |
| tree | e262823ded64dc6cfc246fa4b117b13d81131f36 /grammar/rainerscript.c | |
| parent | aef0be0c1799fbb20955fc1dc014cb9c9772af88 (diff) | |
| parent | 2e4e7e819fed64fa2897af01479a9083b081d0c2 (diff) | |
| download | rsyslog-bdf743197da2e09f303cbd06c708767fe7c6adfd.tar.gz rsyslog-bdf743197da2e09f303cbd06c708767fe7c6adfd.tar.bz2 rsyslog-bdf743197da2e09f303cbd06c708767fe7c6adfd.zip | |
Merge branch 'v7-stable' into tmp
Diffstat (limited to 'grammar/rainerscript.c')
| -rw-r--r-- | grammar/rainerscript.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c index 8a9c9aaa..065e815a 100644 --- a/grammar/rainerscript.c +++ b/grammar/rainerscript.c @@ -1273,8 +1273,12 @@ doFuncCall(struct cnffunc *func, struct var *ret, void* usrptr) estr = var2String(&r[0], &bMustFree); str = (char*) es_str2cstr(estr, NULL); envvar = getenv(str); + if(envvar == NULL) { + ret->d.estr = es_newStr(0); + } else { + ret->d.estr = es_newStrFromCStr(envvar, strlen(envvar)); + } ret->datatype = 'S'; - ret->d.estr = es_newStrFromCStr(envvar, strlen(envvar)); if(bMustFree) es_deleteStr(estr); if(r[0].datatype == 'S') es_deleteStr(r[0].d.estr); free(str); |