Custom Query (518 matches)

As with 554 this was caused by pci->pszFileName being NullStr?. This is from collect.c ~1433

if (!pci->pszFileName) {
                Runtime_Error(pszSrcFile, __LINE__, "pci->pszFileName NULL for %p", pci);
                return 0;
              }
              p = strrchr(pci->pszFileName, '\\');

I added the return 0; as we had previously given the error message and then allowed FM/2 to trap in strrchr.

After I "fixed" the direct edit code it would leave a blank directory line above or below the renamed directory. I added a rescan and the problem was covered up. This seemed fine until it trapped. I traced the trap to UM_RESCAN2 treecnr.c ~791

if (pci && (INT) pci != -1 && pci->pszFileName != NullStr) { //fixme? will try checking pci->pszFileName instead of the pointer
	  if (!(driveflags[toupper(*pci->pszFileName) - 'A'] &
		DRIVE_REMOVABLE) ||
	      driveserial[toupper(*pci->pszFileName) - 'A'] != -1) {

I added the != NullStr? which fixed the trap. I can see we had problems with this in the past based on the fixme. Hopefully this fixed that problem also.