Merged revisions 85818 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Tue, 16 Oct 2007 14:21:27 +0000 (14:21 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 16 Oct 2007 14:21:27 +0000 (14:21 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r85818 | file | 2007-10-16 11:19:39 -0300 (Tue, 16 Oct 2007) | 6 lines

Fix memory allocation issue in threadstorage.
(closes issue #10995)
Reported by: snuffy
Patches:
      new-patch.diff uploaded by snuffy (license 35)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85819 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/threadstorage.c

index de3e9e0..7de7dad 100644 (file)
@@ -56,7 +56,7 @@ void __ast_threadstorage_object_add(void *key, size_t len, const char *file, con
 {
        struct tls_object *to;
 
-       if (!(to = ast_calloc(sizeof(*to), 1)))
+       if (!(to = ast_calloc(1, sizeof(*to))))
                return;
 
        to->key = key;