r21792: Fix crash bug triggered by Excel reported by Jerry.
authorJeremy Allison <jra@samba.org>
Mon, 12 Mar 2007 05:54:14 +0000 (05:54 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:18:34 +0000 (12:18 -0500)
Bad cut-n-paste on rewrite of timestamps.
Jeremy.

source/smbd/trans2.c

index 01956d8119048f87290e868cc671d2d17752085d..58fa4eb31b049cf25f06daddcaad508d41b6f1e1 100644 (file)
@@ -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);