From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 30 Nov 2018 15:02:39 +0000 (+0000)
Subject: [Minor] Fix case when all words are exceptions
X-Git-Tag: 1.8.3~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7fde20c6c535c8bee0ba418fb48cb93b0fe089bb;p=thirdparty%2Frspamd.git

[Minor] Fix case when all words are exceptions
---

diff --git a/src/libutil/shingles.c b/src/libutil/shingles.c
index 2e05b773f5..70aa5fe786 100644
--- a/src/libutil/shingles.c
+++ b/src/libutil/shingles.c
@@ -176,6 +176,17 @@ rspamd_shingles_from_text (GArray *input,
 						}
 					}
 
+					if (word == NULL) {
+						/* Nothing but exceptions */
+						for (i = 0; i < RSPAMD_SHINGLE_SIZE; i ++) {
+							g_free (hashes[i]);
+						}
+
+						g_free (hashes);
+
+						return NULL;
+					}
+
 					row = rspamd_fstring_append (row, word->stemmed.begin,
 							word->stemmed.len);
 				}
@@ -235,6 +246,17 @@ rspamd_shingles_from_text (GArray *input,
 						}
 					}
 
+					if (word == NULL) {
+						/* Nothing but exceptions */
+						for (i = 0; i < RSPAMD_SHINGLE_SIZE; i ++) {
+							g_free (hashes[i]);
+						}
+
+						g_free (hashes);
+
+						return NULL;
+					}
+
 					/* Insert the last element to the pipe */
 					memcpy (&seed, keys[j], sizeof (seed));
 					window[j * SHINGLES_WINDOW + SHINGLES_WINDOW - 1] =