[asterisk-commits] seanbright: branch 1.6.2 r302554 - /branches/1.6.2/main/utils.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Wed Jan 19 13:02:29 2011
New Revision: 302554

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302554
Log:
Don't call strlen() when we only need to look at the next character or two.

(closes issue #18042)
Reported by: wdoekes
Patches:
      astsvn-inefficient-ast-uri-decode.patch uploaded by wdoekes (license 717)

Modified:
    branches/1.6.2/main/utils.c

Modified: branches/1.6.2/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/utils.c?view=diff&rev=302554&r1=302553&r2=302554
==============================================================================
--- branches/1.6.2/main/utils.c (original)
+++ branches/1.6.2/main/utils.c Wed Jan 19 13:02:29 2011
@@ -419,7 +419,7 @@
 	unsigned int tmp;
 
 	for (o = s; *s; s++, o++) {
-		if (*s == '%' && strlen(s) > 2 && sscanf(s + 1, "%2x", &tmp) == 1) {
+		if (*s == '%' && s[1] != '\0' && s[2] != '\0' && sscanf(s + 1, "%2x", &tmp) == 1) {
 			/* have '%', two chars and correct parsing */
 			*o = tmp;
 			s += 2;	/* Will be incremented once more when we break out */