svn commit: samba r10754 - in branches/SAMBA_4_0/source/libcli/raw: .

tridge at samba.org tridge at samba.org
Thu Oct 6 05:25:35 GMT 2005


Author: tridge
Date: 2005-10-06 05:25:35 +0000 (Thu, 06 Oct 2005)
New Revision: 10754

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

Log:

fixed a valgrind error for unmatched SMB replies

Modified:
   branches/SAMBA_4_0/source/libcli/raw/clitransport.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/clitransport.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/clitransport.c	2005-10-06 05:24:46 UTC (rev 10753)
+++ branches/SAMBA_4_0/source/libcli/raw/clitransport.c	2005-10-06 05:25:35 UTC (rev 10754)
@@ -385,7 +385,7 @@
 {
 	uint8_t *buffer, *hdr, *vwv;
 	int len;
-	uint16_t wct=0, mid = 0;
+	uint16_t wct=0, mid = 0, op = 0;
 	struct smbcli_request *req;
 
 	buffer = transport->recv_buffer.buffer;
@@ -424,6 +424,7 @@
 		/* extract the mid for matching to pending requests */
 		mid = SVAL(hdr, HDR_MID);
 		wct = CVAL(hdr, HDR_WCT);
+		op  = CVAL(hdr, HDR_COM);
 	}
 
 	/* match the incoming request against the list of pending requests */
@@ -432,8 +433,7 @@
 	}
 
 	if (!req) {
-		DEBUG(1,("Discarding unmatched reply with mid %d op %d\n", 
-			 mid, CVAL(hdr, HDR_COM)));
+		DEBUG(1,("Discarding unmatched reply with mid %d op %d\n", mid, op));
 		goto error;
 	}
 



More information about the samba-cvs mailing list