From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 17 Jan 2007 20:56:15 +0000 (+0000)
Subject: Merged revisions 51194 via svnmerge from
X-Git-Tag: 1.4.1~264
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0baf4aa9412f4262d5072e9641a2c778987aee82;p=thirdparty%2Fasterisk.git

Merged revisions 51194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r51194 | tilghman | 2007-01-17 14:52:21 -0600 (Wed, 17 Jan 2007) | 4 lines

When ast_strip_quoted was called with a zero-length string, it would treat a
NULL as if it were the quoting character (and would thus return the string
in memory immediately following the passed-in string).

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@51195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/utils.c b/main/utils.c
index 88bd23c198..6d732534b5 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -638,7 +638,7 @@ char *ast_strip_quoted(char *s, const char *beg_quotes, const char *end_quotes)
 	char *q;
 
 	s = ast_strip(s);
-	if ((q = strchr(beg_quotes, *s))) {
+	if ((q = strchr(beg_quotes, *s)) && *q != '\0') {
 		e = s + strlen(s) - 1;
 		if (*e == *(end_quotes + (q - beg_quotes))) {
 			s++;