]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Fix nhits set in pcre fallback
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 10 Sep 2019 13:35:57 +0000 (14:35 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 10 Sep 2019 13:35:57 +0000 (14:35 +0100)
src/libutil/multipattern.c

index 0fc0289699a25fc905055f14eb44acbf2a242707..7e812a0bd9c72b6ab22586bbac1faee9734d2deb 100644 (file)
@@ -663,11 +663,20 @@ rspamd_multipattern_lookup (struct rspamd_multipattern *mp,
                                        &end,
                                        TRUE,
                                        NULL)) {
-                               ret = rspamd_multipattern_acism_cb (i, end - in, &cbd);
+                               if (rspamd_multipattern_acism_cb (i, end - in, &cbd)) {
+                                       goto out;
+                               }
                        }
                }
+out:
+               ret = cbd.ret;
+
+               if (pnfound) {
+                       *pnfound = cbd.nfound;
+               }
        }
        else {
+               /* Plain trie */
                ret = acism_lookup (mp->t, in, len, rspamd_multipattern_acism_cb, &cbd,
                                &state, mp->flags & RSPAMD_MULTIPATTERN_ICASE);