From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 16 Sep 2014 13:59:54 +0000 (+0100)
Subject: Replace use of index() with Ustrchr()
X-Git-Tag: exim-4_85_RC1~53
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=db270929c3df4a10e96ec8fcb890336a0f6ced6e;p=exim.git

Replace use of index() with Ustrchr()
---

diff --git a/src/src/malware.c b/src/src/malware.c
index 04b5887e7..93bcf8667 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -1443,9 +1443,9 @@ malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
 	if ((sockline_scanner = string_nextinlist(&av_scanner_work, &sep,
 					    NULL, 0)))
 	{	/* check for no expansions apart from one %s */
-	  char * s = index(CS sockline_scanner, '%');
+	  uschar * s = Ustrchr(sockline_scanner, '%');
 	  if (s++)
-	    if ((*s != 's' && *s != '%') || index(s+1, '%'))
+	    if ((*s != 's' && *s != '%') || Ustrchr(s+1, '%'))
 	      return m_errlog_defer_3(scanent,
 				    US"unsafe sock scanner call spec", sock);
 	}