aboutsummaryrefslogtreecommitdiffstats
path: root/main/utils.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-15 12:49:31 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-10-15 12:49:31 +0000
commite4b6e79198cc1b0176a1847ee95da54222b4ddcc (patch)
treed71ecdb0d20f1b8ba5daebccecddd4680832fee1 /main/utils.c
parentc9e3c420d022ed30fe50df4d9a86fd3b0ae2fa59 (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: http://svn.digium.com/svn/asterisk/trunk@85544 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/utils.c')
-rw-r--r--main/utils.c3
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;
}