[asterisk-commits] russell: trunk r359115 - in /trunk: ./ res/res_crypto.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Mar 13 19:39:23 2012
New Revision: 359115

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=359115
Log:
Fix incorrect usage of sizeof() in res_crypto.

In this case, just remove the memset().  There was a redundant memset that is
done correctly just 2 lines later.
........

Merged revisions 359110 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 359114 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/res/res_crypto.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/res/res_crypto.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_crypto.c?view=diff&rev=359115&r1=359114&r2=359115
==============================================================================
--- trunk/res/res_crypto.c (original)
+++ trunk/res/res_crypto.c Tue Mar 13 19:39:23 2012
@@ -116,7 +116,6 @@
 		key->infd = -2;
 		return -1;
 	}
-	memset(buf, 0, sizeof(buf));
 	tmp = ast_hide_password(key->infd);
 	memset(buf, 0, size);
 	res = read(key->infd, buf, size);