From: Alan T. DeKok Date: Wed, 4 Aug 2021 12:25:31 +0000 (-0400) Subject: we cache preg only for PCRE X-Git-Tag: release_3_0_24~70 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=830a5aecbf617d081905a08d20a60f8587dca1ea;p=thirdparty%2Ffreeradius-server.git we cache preg only for PCRE --- diff --git a/src/main/regex.c b/src/main/regex.c index 2a31391af25..f66414c903b 100644 --- a/src/main/regex.c +++ b/src/main/regex.c @@ -33,7 +33,9 @@ RCSID("$Id$") #define REQUEST_DATA_REGEX (0xadbeef00) typedef struct regcapture { +#ifdef HAVE_PCRE regex_t *preg; //!< Compiled pattern. +#endif char const *value; //!< Original string. regmatch_t *rxmatch; //!< Match vectors. size_t nmatch; //!< Number of match vectors. @@ -94,11 +96,10 @@ void regex_sub_to_request(REQUEST *request, regex_t **preg, char const *value, s if (!(*preg)->precompiled) { new_sc->preg = talloc_steal(new_sc, *preg); *preg = NULL; - } else -#endif - { + } else { new_sc->preg = *preg; } +#endif request_data_add(request, request, REQUEST_DATA_REGEX, new_sc, true); }