From 8d25c3f2a4bca981e23138c1b960b4da99e1d788 Mon Sep 17 00:00:00 2001 From: Arthur de Jong Date: Sun, 5 Jun 2011 09:14:12 +0000 Subject: handle expressions where the expander function returns NULL (handle it as an empty string) git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1471 ef36b2f9-881f-0410-afb5-c4e39611909c --- common/expr.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'common') diff --git a/common/expr.c b/common/expr.c index fc694cc..7fa4f84 100644 --- a/common/expr.c +++ b/common/expr.c @@ -93,6 +93,8 @@ MUST_USE static const char *parse_dollar_expression( if (parse_name(str,ptr,varname,sizeof(varname))==NULL) return NULL; varvalue=expander(varname,expander_arg); + if (varvalue==NULL) + varvalue=""; if (str[*ptr]=='}') { /* simple substitute */ @@ -148,6 +150,8 @@ MUST_USE static const char *parse_dollar_expression( if (parse_name(str,ptr,varname,sizeof(varname))==NULL) return NULL; varvalue=expander(varname,expander_arg); + if (varvalue==NULL) + varvalue=""; if (strlen(varvalue)>=buflen) return NULL; strcpy(buffer,varvalue); -- cgit v1.2.3