diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-01-17 20:57:51 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2007-01-17 20:57:51 +0000 |
| commit | a48fdb83a5957a6d978507eda0e59b5866c7e68a (patch) | |
| tree | ab87362ea8441f55bfc674ef3fb6371c66362cd7 /main/utils.c | |
| parent | c71d6c12f7a93ee86dc1559bef02e1f00d360a9f (diff) | |
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).
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/utils.c')
| -rw-r--r-- | main/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/utils.c b/main/utils.c index 6728fce7e..dd12009d1 100644 --- a/main/utils.c +++ b/main/utils.c @@ -653,7 +653,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++; |