Merge "func_aes: fix misuse of strlen on binary data" into 13

This commit is contained in:
zuul
2016-03-21 15:19:01 -05:00
committed by Gerrit Code Review

View File

@@ -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);
}