diff options
author | Shawn Routhier <sar@isc.org> | 2011-11-28 18:01:25 +0000 |
---|---|---|
committer | Shawn Routhier <sar@isc.org> | 2011-11-28 18:01:25 +0000 |
commit | c535de44110961932b603f152f38ec432b24c422 (patch) | |
tree | f3a0dff9e88ce4dd4d53d1f5db6b9770cf8a3ea1 /common/tree.c | |
parent | 846af1cd691efd1aa5320da5584be967498697e9 (diff) | |
download | isc-dhcp-c535de44110961932b603f152f38ec432b24c422.tar.gz |
Update 26704 to include a null check on the right hand side as well.
Diffstat (limited to 'common/tree.c')
-rw-r--r-- | common/tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/tree.c b/common/tree.c index 20b2bc64..3c978b09 100644 --- a/common/tree.c +++ b/common/tree.c @@ -1120,7 +1120,7 @@ int evaluate_boolean_expression (result, packet, lease, client_state, *result = 0; memset(&re, 0, sizeof(re)); if (bleft && bright && - (left.data != NULL) && + (left.data != NULL) && (right.data != NULL) && (regcomp(&re, (char *)right.data, regflags) == 0) && (regexec(&re, (char *)left.data, (size_t)0, NULL, 0) == 0)) *result = 1; |