svn commit: samba r3347 - in branches/SAMBA_4_0/source/ntvfs/nbench: .

tridge at samba.org tridge at samba.org
Fri Oct 29 01:07:08 GMT 2004


Author: tridge
Date: 2004-10-29 01:07:07 +0000 (Fri, 29 Oct 2004)
New Revision: 3347

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

Log:
fixed an uninitialised variable bug. Surprisingly hard to track down,
as valgrind got a corrupt stack when trying to debug it.

Modified:
   branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c	2004-10-29 00:51:41 UTC (rev 3346)
+++ branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c	2004-10-29 01:07:07 UTC (rev 3347)
@@ -417,14 +417,20 @@
 static void nbench_read_send(struct smbsrv_request *req)
 {
 	union smb_read *rd = req->async_states->private_data;
-
+	uint32_t nread;
+	
 	switch (rd->generic.level) {
 	case RAW_READ_READX:
+		if (NT_STATUS_IS_OK(req->async_states->status)) {
+			nread = rd->readx.out.nread;
+		} else {
+			nread = 0;
+		}
 		nbench_log(req, "ReadX %d %d %d %d %s\n", 
 			   rd->readx.in.fnum, 
 			   (int)rd->readx.in.offset,
 			   rd->readx.in.maxcnt,
-			   rd->readx.out.nread,
+			   nread,
 			   get_nt_error_c_code(req->async_states->status));
 		break;
 	default:



More information about the samba-cvs mailing list