From 970a8f6bf3b0f0b601567483c29f91af72d99008 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 19 Nov 2015 12:34:29 +0000 Subject: [PATCH] Do not use 'strchr' on rspamd_fstring_t --- src/libutil/addr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libutil/addr.c b/src/libutil/addr.c index 167bd8094..2b5ca9854 100644 --- a/src/libutil/addr.c +++ b/src/libutil/addr.c @@ -562,7 +562,7 @@ rspamd_parse_inet_address (rspamd_inet_addr_t **target, if (src[0] == '[') { /* Ipv6 address in format [::1]:port or just [::1] */ - end = strrchr (src + 1, ']'); + end = memchr (src + 1, ']', srclen - 1); if (end == NULL) { return FALSE; @@ -593,7 +593,7 @@ rspamd_parse_inet_address (rspamd_inet_addr_t **target, } else { - if ((end = strchr (src, ':')) != NULL) { + if ((end = memchr (src, ':', srclen)) != NULL) { /* This is either port number and ipv4 addr or ipv6 addr */ if (ipv6_status == RSPAMD_IPV6_SUPPORTED && rspamd_parse_inet_address_ip6 (src, srclen, &su.s6.sin6_addr)) { -- 2.39.5