summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-03-21 15:19:01 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-03-21 15:19:01 -0500
commit7d6782cc0feb5357c6e9feb7c810f7fbe76190f0 (patch)
tree6d227741f1e98773aaf088ca71618c9dd1bfd174
parent6a40520fe9c4b5a00d8de425b18163cc5aefe8d0 (diff)
parentaa2fcd244eaf9e6099479d289f1833ae471fb2ba (diff)
Merge "func_aes: fix misuse of strlen on binary data" into 13
-rw-r--r--funcs/func_aes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index 3338118f9..f4a8d06b7 100644
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -146,7 +146,7 @@ static int aes_helper(struct ast_channel *chan, const char *cmd, char *data,
}
if (encrypt) { /* if encrypting encode result to base64 */
- ast_base64encode(buf, (unsigned char *) tmp, strlen(tmp), len);
+ ast_base64encode(buf, (unsigned char *) tmp, tmpP - tmp, len);
} else {
memcpy(buf, tmp, len);
}