summaryrefslogtreecommitdiff
path: root/lwlib
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2016-07-01 18:45:24 +0300
committerDmitry Antipov <dmantipov@yandex.ru>2016-07-01 18:45:24 +0300
commitd942c39c44dac1d73f9413979f754fa551f96cbb (patch)
tree249965b28f35fc9601bf881156af045ae0858160 /lwlib
parent55e4e83cf449ce74f97f72f728cd3e935cc8d412 (diff)
downloademacs-d942c39c44dac1d73f9413979f754fa551f96cbb.tar.gz
Avoid yet another possible NULL pointer dereference found by GCC 6.1.1
* lwlib/lwlib.c (lw_get_all_values): Always check the value returned by get_widget_info.
Diffstat (limited to 'lwlib')
-rw-r--r--lwlib/lwlib.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index c68cf77c928..d1c5195dbf9 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1042,11 +1042,13 @@ widget_value*
lw_get_all_values (LWLIB_ID id)
{
widget_info* info = get_widget_info (id, False);
- widget_value* val = info->val;
- if (lw_get_some_values (id, val))
- return val;
- else
- return NULL;
+ if (info)
+ {
+ widget_value* val = info->val;
+ if (lw_get_some_values (id, val))
+ return val;
+ }
+ return NULL;
}
/* internal function used by the library dependent implementation to get the