svn commit: samba r23967 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2007-07-19 10:23:36 +0000 (Thu, 19 Jul 2007)
New Revision: 23967

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23967

Log:
Memleak fix from Atsushi Nakabayashi <nakabayashi at miraclelinux.com>

Thanks!

Volker

Modified:
   branches/SAMBA_3_2/source/smbd/lanman.c
   branches/SAMBA_3_2_0/source/smbd/lanman.c


Changeset:
Modified: branches/SAMBA_3_2/source/smbd/lanman.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/lanman.c	2007-07-19 07:48:26 UTC (rev 23966)
+++ branches/SAMBA_3_2/source/smbd/lanman.c	2007-07-19 10:23:36 UTC (rev 23967)
@@ -850,6 +850,7 @@
 	if (mdrcnt > 0) {
 		*rdata = SMB_REALLOC_LIMIT(*rdata,mdrcnt);
 		if (!*rdata) {
+			SAFE_FREE(queue);
 			return False;
 		}
 		desc.base = *rdata;
@@ -882,6 +883,8 @@
 	*rparam_len = 6;
 	*rparam = SMB_REALLOC_LIMIT(*rparam,*rparam_len);
 	if (!*rparam) {
+		SAFE_FREE(queue);
+		SAFE_FREE(tmpdata);
 		return False;
 	}
 	SSVALS(*rparam,0,desc.errcode);

Modified: branches/SAMBA_3_2_0/source/smbd/lanman.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/lanman.c	2007-07-19 07:48:26 UTC (rev 23966)
+++ branches/SAMBA_3_2_0/source/smbd/lanman.c	2007-07-19 10:23:36 UTC (rev 23967)
@@ -850,6 +850,7 @@
 	if (mdrcnt > 0) {
 		*rdata = SMB_REALLOC_LIMIT(*rdata,mdrcnt);
 		if (!*rdata) {
+			SAFE_FREE(queue);
 			return False;
 		}
 		desc.base = *rdata;
@@ -882,6 +883,8 @@
 	*rparam_len = 6;
 	*rparam = SMB_REALLOC_LIMIT(*rparam,*rparam_len);
 	if (!*rparam) {
+		SAFE_FREE(queue);
+		SAFE_FREE(tmpdata);
 		return False;
 	}
 	SSVALS(*rparam,0,desc.errcode);