Changeset 1478 for trunk/dll/filldir.c

Timestamp:

Nov 15, 2009, 11:23:09 PM (16 years ago)

Author:

Gregg Young

Message:

Fix trap on rescan following change of label/drive type or environment on SMP; Ticket 408

File:

• trunk/dll/filldir.c (modified) (3 diffs)

trunk/dll/filldir.c

@@ -82 +82 @@
   13 Oct 09 SHL Avoid szDriver overflow in FillTreeCnr
   13 Oct 09 SHL Restore missing drives in drive drop-down listbox; optimize updates
+  15 Nov 09 GKY Avoid szBuf overflow in FillTreeCnr
+  15 Nov 09 GKY Optimize some check code
 
 ***********************************************************************/
@@ -715 +717 @@
   ULONG flags;
   CHAR *p;
-  CHAR szBuf[80];
+  CHAR szBuf[CCHMAXPATH];
 
   // fill in a container record from a FILESTATUS4L structure
@@ -1350 +1352 @@
             }
           }
-          if (stricmp(volser.volumelabel, NullStr) != 0 && fShowDriveLabelInTree)
+          if (fShowDriveLabelInTree && stricmp(volser.volumelabel, NullStr) != 0)
             strcpy(szFSType, volser.volumelabel);
           pci->rc.flRecordAttr |= CRA_RECORDREADONLY;