texinfo/info indices.c

[Sergey Poznyakoff]

CVSROOT:        /cvsroot/texinfo
Module name:    texinfo
Changes by:     Sergey Poznyakoff <gray>        10/08/30 16:18:48

Modified files:
        info           : indices.c 

Log message:
        (do_info_index_search, index_entry_exists): Check
        for NULL return from file_buffer_of_window.  Patch proposed by
        Vitezslav Crhonek <address@hidden>.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/indices.c?cvsroot=texinfo&r1=1.12&r2=1.13

Patches:
Index: indices.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/indices.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- indices.c   8 Aug 2010 16:59:04 -0000       1.12
+++ indices.c   30 Aug 2010 16:18:48 -0000      1.13
@@ -1,5 +1,5 @@
 /* indices.c -- deal with an Info file index.
-   $Id: indices.c,v 1.12 2010/08/08 16:59:04 gray Exp $
+   $Id: indices.c,v 1.13 2010/08/30 16:18:48 gray Exp $
 
    Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2004, 2007, 2008
    Free Software Foundation, Inc.
@@ -194,6 +194,7 @@
      index for, build and remember an index now. */
   fb = file_buffer_of_window (window);
   if (!initial_index_filename ||
+      !fb ||
       (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
     {
       info_free_references (index_index);
@@ -292,8 +293,9 @@
     return 0;
 
   fb = file_buffer_of_window (window);
-  if (!initial_index_filename
-      || (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
+  if (!initial_index_filename ||
+      !fb ||
+      (FILENAME_CMP (initial_index_filename, fb->filename) != 0))
     {
       info_free_references (index_index);
       index_index = info_indices_of_file_buffer (fb);