Skip to content

W
wine-winehq
Commit 84e8ea2f authored by Lei Zhang's avatar Lei Zhang Committed by Alexandre Julliard
Browse files
Options

sane.ds: Check return value from sane_get_option_descriptor().

parent 05907c3e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
dlls/sane.ds/ui.c
View file @ 84e8ea2f
...@@ -394,6 +394,8 @@ static LPDLGTEMPLATEW create_options_page(HDC hdc, int *from_index, ...@@ -394,6 +394,8 @@ static LPDLGTEMPLATEW create_options_page(HDC hdc, int *from_index,
int hold_for_group = 0; int hold_for_group = 0;
opt = psane_get_option_descriptor(activeDS.deviceHandle, i); opt = psane_get_option_descriptor(activeDS.deviceHandle, i);
if (!opt)
continue;
if (opt->type == SANE_TYPE_GROUP && split_tabs) if (opt->type == SANE_TYPE_GROUP && split_tabs)
{ {
if (control_len > 0) if (control_len > 0)
...@@ -407,6 +409,8 @@ static LPDLGTEMPLATEW create_options_page(HDC hdc, int *from_index, ...@@ -407,6 +409,8 @@ static LPDLGTEMPLATEW create_options_page(HDC hdc, int *from_index,
return NULL; return NULL;
} }
} }
if (!SANE_OPTION_IS_ACTIVE (opt->cap))
continue;
len = create_item(hdc, opt, ID_BASE + i, &item_tpl, y, &x, &count); len = create_item(hdc, opt, ID_BASE + i, &item_tpl, y, &x, &count);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment