diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-05-04 22:17:38 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-05-04 22:17:38 +0000 |
| commit | 781f4657b91d6c8fa3dcf3bc9f0daaad5155506e (patch) | |
| tree | 02eb58c52c581367e9fb47d8de1c633b2b094030 /funcs/func_aes.c | |
| parent | 8842f76a7f486cd3d223a2c28ace91fcab5e8a12 (diff) | |
Fix many issues from the NULL_RETURNS Coverity report
Most of the changes here are trivial NULL checks. There are a couple
optimizations to remove the need to check for NULL and outboundproxy parsing
in chan_sip.c was rewritten to avoid use of strtok. Additionally, a bug was
found and fixed with the parsing of outboundproxy when "outboundproxy=," was
set.
(Closes issue ASTERISK-19654)
........
Merged revisions 365398 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 365399 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@365400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'funcs/func_aes.c')
| -rw-r--r-- | funcs/func_aes.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/funcs/func_aes.c b/funcs/func_aes.c index c176f4863..2e1959cd8 100644 --- a/funcs/func_aes.c +++ b/funcs/func_aes.c @@ -114,6 +114,10 @@ static int aes_helper(struct ast_channel *chan, const char *cmd, char *data, ast_aes_set_encrypt_key((unsigned char *) args.key, &ecx); /* encryption: plaintext -> encryptedtext -> base64 */ ast_aes_set_decrypt_key((unsigned char *) args.key, &dcx); /* decryption: base64 -> encryptedtext -> plaintext */ tmp = ast_calloc(1, len); /* requires a tmp buffer for the base64 decode */ + if (!tmp) { + ast_log(LOG_ERROR, "Unable to allocate memory for data\n"); + return -1; + } tmpP = tmp; encrypt = strcmp("AES_DECRYPT", cmd); /* -1 if encrypting, 0 if decrypting */ |