From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 10 Sep 2019 13:35:57 +0000 (+0100)
Subject: [Minor] Fix nhits set in pcre fallback
X-Git-Tag: 2.0~227
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f615c8013e5e01893d2e3e4d10aeaa541663761;p=thirdparty%2Frspamd.git

[Minor] Fix nhits set in pcre fallback
---

diff --git a/src/libutil/multipattern.c b/src/libutil/multipattern.c
index 0fc0289699..7e812a0bd9 100644
--- a/src/libutil/multipattern.c
+++ b/src/libutil/multipattern.c
@@ -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);