# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1240957270 0
# Node ID a780680f090dc64ae9926b06564c0a4ce99629d5
# Parent  73ac2cd2cba3d9dbf61cc42b96b285f87ac5f044# Parent  83ae84d4b0008daee539dac56641e374088a177c
merge of '4a2d7c0b8570558cada900f60d7696231954c231'
     and 'e97dfd6e35de719fe7bffabef680c282f4702341'

diff -r 73ac2cd2cba3 -r a780680f090d libpurple/protocols/oscar/family_chatnav.c
--- a/libpurple/protocols/oscar/family_chatnav.c	Tue Apr 28 21:15:30 2009 +0000
+++ b/libpurple/protocols/oscar/family_chatnav.c	Tue Apr 28 22:21:10 2009 +0000
@@ -44,6 +44,8 @@
 
 	if (snac2->family != SNAC_FAMILY_CHATNAV) {
 		purple_debug_warning("oscar", "chatnav error: received response that maps to corrupt request (fam=%04x)\n", snac2->family);
+		g_free(snac2->data);
+		g_free(snac2);
 		return 0;
 	}
 
@@ -462,6 +464,8 @@
 
 	if (snac2->family != SNAC_FAMILY_CHATNAV) {
 		purple_debug_misc("oscar", "faim: chatnav_parse_info: received response that maps to corrupt request! (fam=%04x)\n", snac2->family);
+		g_free(snac2->data);
+		g_free(snac2);
 		return 0;
 	}