[Gaim-commits] SF.net SVN: gaim: [16055] trunk/src/protocols/oscar/family_icbm.c

[<the...@us...>]

Revision: 16055
Author:   thekingant
Date:     2006-04-17 21:25:54 -0700 (Mon, 17 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16055&view=rev

Log Message:
-----------
Fix Coverity CID 86: Malformed incoming IMs could cause a double-free.
I don't think this will ever happen because the oscar servers filter
malformed SNACs.

Modified Paths:
--------------
    trunk/src/protocols/oscar/family_icbm.c
Modified: trunk/src/protocols/oscar/family_icbm.c
===================================================================
--- trunk/src/protocols/oscar/family_icbm.c	2006-04-18 04:16:16 UTC (rev 16054)
+++ trunk/src/protocols/oscar/family_icbm.c	2006-04-18 04:25:54 UTC (rev 16055)
@@ -1679,13 +1679,13 @@
 
 		} else if (type == 0x0017) {
 
-			free(args.extdata);
-			args.extdatalen = length;
-			if (args.extdatalen > byte_stream_empty(bs))
+			if (length > byte_stream_empty(bs))
 			{
 				gaim_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->sn);
 				break;
 			}
+			free(args.extdata);
+			args.extdatalen = length;
 			if (args.extdatalen == 0)
 				args.extdata = NULL;
 			else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.