From 8407683f7764e7fdb9fdeb84899a90483680a066 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 15 Oct 2015 15:30:54 +0100 Subject: [PATCH] Do not check out of boundary memory. --- src/libutil/http.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libutil/http.c b/src/libutil/http.c index e082c3c24..9c08f41f8 100644 --- a/src/libutil/http.c +++ b/src/libutil/http.c @@ -2420,7 +2420,7 @@ rspamd_http_message_parse_query (struct rspamd_http_message *msg) while (p <= end) { switch (state) { case parse_key: - if ((*p == '&' || p == end) && p > c) { + if ((p == end || *p == '&') && p > c) { /* We have a single parameter without a value */ key = rspamd_fstring_new_init (c, p - c); key_tok = rspamd_ftok_map (key); @@ -2458,7 +2458,7 @@ rspamd_http_message_parse_query (struct rspamd_http_message *msg) break; case parse_value: - if ((*p == '&' || p == end) && p >= c) { + if ((p == end || *p == '&') && p >= c) { g_assert (key != NULL); if (p > c) { value = rspamd_fstring_new_init (c, p - c); @@ -2483,7 +2483,7 @@ rspamd_http_message_parse_query (struct rspamd_http_message *msg) break; case parse_ampersand: - if (*p != '&' && p != end) { + if (p != end && *p != '&') { c = p; state = parse_key; } -- 2.39.5