texinfo ChangeLog info/man.c

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/12/03 23:49:20

Modified files:
        .              : ChangeLog 
        info           : man.c 

Log message:
        null deref patch from ralfw

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1187&r2=1.1188
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/man.c?cvsroot=texinfo&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1187
retrieving revision 1.1188
diff -u -b -r1.1187 -r1.1188
--- ChangeLog   3 Dec 2010 19:25:54 -0000       1.1187
+++ ChangeLog   3 Dec 2010 23:49:20 -0000       1.1188
@@ -1,3 +1,8 @@
+2010-12-03  Ralf Wildenhues  <address@hidden>
+
+       * info/man.c (get_manpage_node): Avoid null pointer dereference
+       of info_windows.
+
 2010-12-03  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Configuration Variables and Options),

Index: info/man.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/man.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- info/man.c  23 Jan 2009 09:37:40 -0000      1.15
+++ info/man.c  3 Dec 2010 23:49:20 -0000       1.16
@@ -1,5 +1,5 @@
 /*  man.c: How to read and format man files.
-    $Id: man.c,v 1.15 2009/01/23 09:37:40 gray Exp $
+    $Id: man.c,v 1.16 2010/12/03 23:49:20 karl Exp $
 
    Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 
    2007, 2008, 2009 Free Software Foundation, Inc.
@@ -104,7 +104,8 @@
             the feet of info_windows[] array.  Therefore, all the
             nodes on that list which are showing man pages have their
             contents member pointing into the blue.  Undo that harm.  */
-         if (old_contents && oldsize && old_contents != file_buffer->contents)
+         if (old_contents && oldsize && old_contents != file_buffer->contents
+             && info_windows)
            {
              int iw;
              INFO_WINDOW *info_win;