diff options
author | Russell Bryant <russell@russellbryant.com> | 2007-10-15 12:49:31 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2007-10-15 12:49:31 +0000 |
commit | 42b2f932d2c3e5ed06f4ccd7119d8c74507f7690 (patch) | |
tree | d71ecdb0d20f1b8ba5daebccecddd4680832fee1 /main | |
parent | b119e1c8a13e62a4476d8d2040f2aa532a678049 (diff) |
Merged revisions 85543 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85543 | russell | 2007-10-15 07:48:10 -0500 (Mon, 15 Oct 2007) | 8 lines
Make sure that the base64 decoder returns a terminated string.
(closes issue #10979)
Reported by: ys
Patches:
util.c.diff uploaded by ys (license 281)
- small mods by me
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85544 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/utils.c b/main/utils.c index a4b0a4557..80fadfdcc 100644 --- a/main/utils.c +++ b/main/utils.c @@ -352,6 +352,9 @@ int ast_base64decode(unsigned char *dst, const char *src, int max) cnt++; } } + if (cnt == max) + dst--; + *dst = '\0'; /* Dont worry about left over bits, they're extra anyway */ return cnt; } |