Merged revisions 157632 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r157632 | mmichelson | 2008-11-18 18:59:48 -0600 (Tue, 18 Nov 2008) | 10 lines

If malloc returns NULL, we need to  return NULL immediately or
else Asterisk will crash when attempting to dereference the NULL
pointer

(closes issue #13858)
Reported by: eliel
Patches:
      astmm.c.patch uploaded by eliel (license 64)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@157636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.1
Mark Michelson 17 years ago
parent b58d925422
commit 78b55553fd

@ -114,6 +114,7 @@ static inline void *__ast_alloc_region(size_t size, const enum func_type which,
if (!(reg = malloc(size + sizeof(*reg) + sizeof(*fence)))) {
astmm_log("Memory Allocation Failure - '%d' bytes in function %s "
"at line %d of %s\n", (int) size, func, lineno, file);
return NULL;
}
ast_copy_string(reg->file, file, sizeof(reg->file));

Loading…
Cancel
Save