Don't crash if the twain device name is null.

abe2c581 · Mike McCormack · Alexandre Julliard · 54a2891d · abe2c581
Commit abe2c581 authored Sep 06, 2005 by Mike McCormack Committed by Alexandre Julliard Sep 06, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

dsm_ctrl.c dlls/twain/dsm_ctrl.c +4 -1

No files found.
--- a/dlls/twain/dsm_ctrl.c
+++ b/dlls/twain/dsm_ctrl.c
@@ -185,7 +185,10 @@ TW_UINT16 TWAIN_IdentityGetNext (pTW_IDENTITY pOrigin, TW_MEMREF pData)

    TRACE("DG_CONTROL/DAT_IDENTITY/MSG_GETNEXT\n");

-    if (device_list && device_list[DSM_currentDevice])
+    if (device_list && device_list[DSM_currentDevice] &&
+        device_list[DSM_currentDevice]->name &&
+        device_list[DSM_currentDevice]->vendor &&
+        device_list[DSM_currentDevice]->model)
    {
        pSourceIdentity->Id = DSM_sourceId ++;
        strcpy (pSourceIdentity->ProductName, device_list[DSM_currentDevice]->name);