Don't crash if no .imm files are found

smowton · Feb 8, 2016 · 3927143 · 3927143
1 parent 14f436e
commit 3927143
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/Source/increadimail_convert.h b/Source/increadimail_convert.h
@@ -28,6 +28,8 @@ typedef enum INCREDIMAIL_VERSIONS {
    INCREDIMAIL_2,
 };
 
+extern HWND global_hwnd;
+
 void email_count( char *, int *, int * );
 //***************************************************************************
 // INPUTS:

diff --git a/Source/incredimail_convert.c b/Source/incredimail_convert.c
@@ -324,6 +324,10 @@ int total_count = 1;
    list_output = CreateFile(temp_filename, GENERIC_WRITE, 0x0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );
 
    hFind = FindFirstFile(database_filename, &FindFileData);
+   if (hFind == INVALID_HANDLE_VALUE) {
+	   MessageBox(global_hwnd, "No .imm files found within given directory", "Error!", MB_OK);
+	   return -1;
+   }
 
    sprintf(temp_string, "%s\\%s%c%c", directory_search, FindFileData.cFileName, 0x0D, 0x0A );
    WriteFile( list_output, temp_string, (DWORD) strlen( temp_string ), &dummy, NULL );

diff --git a/Source/winmain.c b/Source/winmain.c
@@ -567,6 +567,8 @@ enum INCREDIMAIL_VERSION incredimail_version;
    } else {
 
       total_count = FindDatabaseFiles( im_database_filename, temp_file_listing );
+	  if (total_count < 0)
+		  return;
 
       // set the progress bar 2
       SendDlgItemMessage( global_hwnd, IDC_PROGRESS2, PBM_SETRANGE, 0, (LPARAM) MAKELPARAM (0, total_count));