From: Jeremy Allison <jra@samba.org>
Date: Mon, 12 Mar 2007 05:54:14 +0000 (+0000)
Subject: r21792: Fix crash bug triggered by Excel reported by Jerry.
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~957
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1809e0866ae135af1d5ea36a8534e1678ee9b27d;p=thirdparty%2Fsamba.git

r21792: Fix crash bug triggered by Excel reported by Jerry.
Bad cut-n-paste on rewrite of timestamps.
Jeremy.
---

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 01956d81190..58fa4eb31b0 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -3403,7 +3403,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		files_struct *fsp1 = file_find_di_first(sbuf.st_dev, sbuf.st_ino);
 		if (fsp1 && !null_timespec(fsp1->pending_modtime)) {
 			/* the pending modtime overrides the current modtime */
-			mtime_ts = fsp->pending_modtime;
+			mtime_ts = fsp1->pending_modtime;
 		}
 		if (fsp1 && fsp1->initial_allocation_size) {
 			allocation_size = get_allocation_size(conn, fsp1, &sbuf);