aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-12 16:56:49 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-12 16:56:49 +0000
commitbdd75112f5c4575fbc3ae3eb72e5c6ac6cbd131c (patch)
tree9a68f1b27d8448ddd856c84aa299fb782fc82149 /main
parent0eccf2549b498f953eb24584c302144f545c4f6e (diff)
Merged revisions 142748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r142748 | tilghman | 2008-09-12 11:54:44 -0500 (Fri, 12 Sep 2008) | 3 lines When checking for an encoded character, make sure the string isn't blank, first. (Closes issue #13470) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@142749 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/app.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/app.c b/main/app.c
index 2b63128af..bf3b248d4 100644
--- a/main/app.c
+++ b/main/app.c
@@ -1703,6 +1703,11 @@ int ast_get_encoded_char(const char *stream, char *result, size_t *consumed)
int i;
*consumed = 1;
*result = 0;
+ if (ast_strlen_zero(stream)) {
+ *consumed = 0;
+ return -1;
+ }
+
if (*stream == '\\') {
*consumed = 2;
switch (*(stream + 1)) {