Fix shr.el/image build problem

[gnu-emacs] / lwlib / lwlib.c

diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 7f2f753c1d4b36feeda1d6e8fc3592295469b371..d1c5195dbf989144bf79f9f8d54b912a3dc877b3 100644 (file)
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -1,7 +1,7 @@
 /* A general interface to the widgets of different toolkits.
 
 Copyright (C) 1992, 1993 Lucid, Inc.
-Copyright (C) 1994-1996, 1999-2014 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2016 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
@@ -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