mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 20:20:07 +00:00
Merged revisions 302555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r302555 | seanbright | 2011-01-19 14:03:32 -0500 (Wed, 19 Jan 2011) | 14 lines Merged revisions 302554 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r302554 | seanbright | 2011-01-19 14:02:29 -0500 (Wed, 19 Jan 2011) | 7 lines 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) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -429,7 +429,7 @@ void ast_uri_decode(char *s)
|
|||||||
unsigned int tmp;
|
unsigned int tmp;
|
||||||
|
|
||||||
for (o = s; *s; s++, o++) {
|
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 */
|
/* have '%', two chars and correct parsing */
|
||||||
*o = tmp;
|
*o = tmp;
|
||||||
s += 2; /* Will be incremented once more when we break out */
|
s += 2; /* Will be incremented once more when we break out */
|
||||||
|
Reference in New Issue
Block a user