Changeset 731 for trunk/dll/objcnr.c

Timestamp:

Jul 24, 2007, 1:18:39 AM (18 years ago)

Author:

Steven Levine

Message:

Correct ticket 24 pointer errors for Gregg

File:

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

trunk/dll/objcnr.c

@@ -67 +67 @@
   RECORDINSERT ri;
   PCNRITEM pciP;
-  CHAR *f = 0;
 
   ffb = xmalloc(sizeof(FILEFINDBUF3), pszSrcFile, __LINE__);
@@ -92 +91 @@
 
   if ((!rc && (ffb->attrFile & FILE_DIRECTORY))) {
-    pciP =
-      WinSendMsg(hwndCnr, CM_ALLOCRECORD, MPFROMLONG(EXTRA_RECORD_BYTES2),
-                 MPFROMLONG(1L));
+    pciP = WinSendMsg(hwndCnr,
+                      CM_ALLOCRECORD,
+                      MPFROMLONG(EXTRA_RECORD_BYTES2),
+                      MPFROMLONG(1L));
     if (!pciP) {
       free(ffb);
@@ -101 +101 @@
     pciP->pszFileName = xstrdup(filename, pszSrcFile, __LINE__);
     pciP->pszDispAttr = pciP->szDispAttr;
+    *pciP->szDispAttr = 0;
     //pciP->pszSubject = pciP->szSubject;
+    pciP->pszSubject = xstrdup(NullStr, pszSrcFile, __LINE__);  // 23 Jul 07 SHL
     //pciP->pszLongname = pciP->szLongname;
-    pciP->pszDispAttr = pciP->szDispAttr;
-    *pciP->szDispAttr = 0;
-    pciP->pszLongname = xstrdup(f, pszSrcFile, __LINE__);
-    pciP->pszSubject = xstrdup(f, pszSrcFile, __LINE__);
+    pciP->pszLongname = xstrdup(NullStr, pszSrcFile, __LINE__);
     if (strlen(filename) < 4)
       pciP->pszFileName = pciP->pszFileName;