[asterisk-commits] tilghman: trunk r51196 - in /trunk: ./ main/utils.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Wed Jan 17 14:57:51 2007
New Revision: 51196

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51196
Log:
Merged revisions 51195 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r51195 | tilghman | 2007-01-17 14:56:15 -0600 (Wed, 17 Jan 2007) | 12 lines

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).

........

................

Modified:
    trunk/   (props changed)
    trunk/main/utils.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/utils.c
URL: http://svn.digium.com/view/asterisk/trunk/main/utils.c?view=diff&rev=51196&r1=51195&r2=51196
==============================================================================
--- trunk/main/utils.c (original)
+++ trunk/main/utils.c Wed Jan 17 14:57:51 2007
@@ -653,7 +653,7 @@
 	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++;