[asterisk-commits] may: trunk r306499 - /trunk/addons/chan_ooh323.c

[SVN commits to the Asterisk project]

Author: may
Date: Sat Feb  5 16:16:07 2011
New Revision: 306499

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306499
Log:
fix trivial issue after dvossel patch, initial zero fill user and peer
structure before cap structure allocated.

Modified:
    trunk/addons/chan_ooh323.c

Modified: trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_ooh323.c?view=diff&rev=306499&r1=306498&r2=306499
==============================================================================
--- trunk/addons/chan_ooh323.c (original)
+++ trunk/addons/chan_ooh323.c Sat Feb  5 16:16:07 2011
@@ -2179,11 +2179,11 @@
 
    	user = ast_calloc(1,sizeof(struct ooh323_user));
 	if (user) {
+		memset(user, 0, sizeof(struct ooh323_user));
 		if (!(user->cap = ast_format_cap_alloc_nolock())) {
 			ast_free(user);
 			return NULL;
 		}
-		memset(user, 0, sizeof(struct ooh323_user));
 		ast_mutex_init(&user->lock);
 		ast_copy_string(user->name, name, sizeof(user->name));
 		ast_format_cap_copy(user->cap, gCap);
@@ -2292,11 +2292,11 @@
 
 	peer = ast_calloc(1, sizeof(*peer));
 	if (peer) {
+		memset(peer, 0, sizeof(struct ooh323_peer));
 		if (!(peer->cap = ast_format_cap_alloc_nolock())) {
 			ast_free(peer);
 			return NULL;
 		}
-		memset(peer, 0, sizeof(struct ooh323_peer));
 		ast_mutex_init(&peer->lock);
 		ast_copy_string(peer->name, name, sizeof(peer->name));
 		ast_format_cap_copy(peer->cap, gCap);