Changeset 1146

Timestamp:

Sep 1, 2008, 11:48:20 PM (17 years ago)

Author:

Gregg Young

Message:

Fixes strrchr trap in FreeCnrItemData when pci->pszFileName is NULL (Ticket 278)

File:

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

trunk/dll/filldir.c

@@ -47 +47 @@
   02 Aug 08 GKY Remove redundant strcpys from inner loop
   23 Aug 08 GKY Free pszDisplayName when appropriate
+  01 Sep 08 GKY Updated FreeCnrItemData toprevent trap in strrchr if pci->pszFileName is NULL.
 
 ***********************************************************************/
@@ -1625 +1626 @@
   if (pci->pszSubject && pci->pszSubject != NullStr) {
     psz = pci->pszSubject;
-    // pci->pszSubject = NullStr;
+    //pci->pszSubject = NullStr;
     pci->pszSubject = NULL;             // for debug
     free(psz);
@@ -1637 +1638 @@
       pci->pszLongName != pci->pszDisplayName + 1) {
     psz = pci->pszLongName;
-    // pci->pszLongName = NullStr;
+    //pci->pszLongName = NullStr;
     pci->pszLongName = NULL;            // for debug
     free(psz);
   }
-
-  if (pci->pszDisplayName &&
+  if (!pci->pszFileName)
+    DbgMsg(pszSrcFile, __LINE__, "FreeCnrItemData pci->pszFileName is NULL");
+  if (pci->pszFileName &&
+      pci->pszDisplayName &&
       pci->pszDisplayName != NullStr &&
       pci->pszDisplayName != pci->pszFileName &&
       pci->pszDisplayName != strrchr(pci->pszFileName, '\\') &&
+      pci->pszDisplayName != strrchr(pci->pszFileName, ':') &&
+      pci->pszDisplayName != strrchr(pci->pszFileName, ':') + 1 &&
       pci->pszDisplayName != strrchr(pci->pszFileName, '\\') + 1) {
     psz = pci->pszDisplayName;
+    //pci->pszDisplayName = NullStr;
     pci->pszDisplayName = NULL;         // for debug
     free(psz);
@@ -1654 +1660 @@
   if (pci->pszFileName && pci->pszFileName != NullStr) {
     psz = pci->pszFileName;
-    // pci->pszFileName = NullStr;
+    //pci->pszFileName = NullStr;
     pci->pszFileName = NULL;            // for debug
     free(psz);
@@ -1661 +1667 @@
   if (pci->pszFmtFileSize && pci->pszFmtFileSize != NullStr) {
     psz = pci->pszFmtFileSize;
-    // pci->pszFmtFileSize = NullStr;
+    //pci->pszFmtFileSize = NullStr;
     pci->pszFmtFileSize = NULL;         // for debug
     free(psz);