# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 1005993984 0
# Node ID e0f2d5ffc822682ed766bc0ffc540c7968ac08af
# Parent  1377d461b09c920d4270173e1c8c6fe9c70eca44
(tool_bar_item_info): Avoid calling Fget_text_property
with invalid position.

diff -r 1377d461b09c -r e0f2d5ffc822 src/xdisp.c
--- a/src/xdisp.c	Sat Nov 17 09:38:14 2001 +0000
+++ b/src/xdisp.c	Sat Nov 17 10:46:24 2001 +0000
@@ -7935,11 +7935,18 @@
 {
   Lisp_Object prop;
   int success_p;
+  int charpos;
+
+  /* This function can be called asynchronously, which means we must
+     exclude any possibility that Fget_text_property signals an
+     error.  */
+  charpos = min (XSTRING (f->current_tool_bar_string)->size, glyph->charpos);
+  charpos = max (0, charpos);
   
   /* Get the text property `menu-item' at pos. The value of that
      property is the start index of this item's properties in
      F->tool_bar_items.  */
-  prop = Fget_text_property (make_number (glyph->charpos),
+  prop = Fget_text_property (make_number (charpos),
 			     Qmenu_item, f->current_tool_bar_string);
   if (INTEGERP (prop))
     {