FS-11903: Fix errors reported by PVS-Studio Static Code Analyzer for switch_regex.c

diff --git a/src/switch_regex.c b/src/switch_regex.c
index 5a82e21752936110a5672e1ce9078abef040a5d3..21e54b29fef86e7bf85a75c7fec72f2419aba6be 100644 (file)
--- a/src/switch_regex.c
+++ b/src/switch_regex.c
@@ -75,7 +75,7 @@ SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expressi
        if (*expression == '/') {
                char *opts = NULL;
                tmp = strdup(expression + 1);
-               assert(tmp);
+               switch_assert(tmp);
                if ((opts = strrchr(tmp, '/'))) {
                        *opts++ = '\0';
                } else {
@@ -85,7 +85,7 @@ SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expressi
                        goto end;
                }
                expression = tmp;
-               if (opts) {
+               if (*opts) {
                        if (strchr(opts, 'i')) {
                                flags |= PCRE_CASELESS;
                        }
@@ -227,7 +227,7 @@ SWITCH_DECLARE(switch_status_t) switch_regex_match_partial(const char *target, c
        if (*expression == '/') {
                char *opts = NULL;
                tmp = strdup(expression + 1);
-               assert(tmp);
+               switch_assert(tmp);
                if ((opts = strrchr(tmp, '/'))) {
                        *opts++ = '\0';
                } else {
@@ -237,7 +237,7 @@ SWITCH_DECLARE(switch_status_t) switch_regex_match_partial(const char *target, c
                        goto end;
                }
                expression = tmp;
-               if (opts) {
+               if (*opts) {
                        if (strchr(opts, 'i')) {
                                flags |= PCRE_CASELESS;
                        }