comdlg32: Prevent SEGV in FILEOPEN95_OnOpen when a malformed filter is passed.

FILEOPEN95_OnOpen assumes that each item in the filter list returns a non-NULL pointer for CB_GETITEMDATA.

comdlg32: Prevent SEGV in FILEOPEN95_OnOpen when a malformed filter is passed.
f1bd9ae2 · Troy Rollo · Alexandre Julliard · 93fd4c12 · f1bd9ae2
Commit f1bd9ae2 authored May 30, 2006 by Troy Rollo Committed by Alexandre Julliard May 30, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

filedlg.c dlls/comdlg32/filedlg.c +3 -2

No files found.
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -2370,8 +2370,6 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
      CBAddStringW(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay);

      nFilters++;
-      /* malformed filters are added anyway... */
-      if (!*lpstrPos) break;

      /* Copy the extensions */
      if (!(lpstrExt = MemAlloc((strlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL;
@@ -2380,6 +2378,9 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)

      /* Add the item at the end of the combo */
      CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters-1, lpstrExt);
+
+      /* malformed filters are added anyway... */
+      if (!*lpstrExt) break;
    }
  }