diff options
| author |   Bjørn Mork <bjorn@mork.no> | 2011-12-08 14:05:48 +0100 |
|---|---|---|
| committer | Bjørn Mork <bjorn@mork.no> | 2011-12-08 14:05:48 +0100 |
| commit | 402b4a6e3f8c2f42fe326b0b90c5311d2edbb6f3 (patch) | |
| tree | ca5a1f32b733dcf40d999478482bf3762b13999f /common/tree.c | |
| parent | 12735fbbd10c187016610b6a862ac0dedb89a7b0 (diff) | |
| parent | 77367740763b42ddf41e7ba1bfaebef96463a450 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'common/tree.c')
| -rw-r--r-- | common/tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/tree.c b/common/tree.c index d09107b..3c978b0 100644 --- a/common/tree.c +++ b/common/tree.c @@ -1120,6 +1120,7 @@ int evaluate_boolean_expression (result, packet, lease, client_state, *result = 0; memset(&re, 0, sizeof(re)); if (bleft && bright && + (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; |