texinfo ChangeLog install-info/install-info.c

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     13/01/05 23:46:38

Modified files:
        .              : ChangeLog 
        install-info   : install-info.c 

Log message:
        tiny memory leaks in .gz and .xz cases

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1497&r2=1.1498
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/install-info.c?cvsroot=texinfo&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1497
retrieving revision 1.1498
diff -u -b -r1.1497 -r1.1498
--- ChangeLog   5 Jan 2013 17:02:09 -0000       1.1497
+++ ChangeLog   5 Jan 2013 23:46:38 -0000       1.1498
@@ -1,5 +1,9 @@
 2013-01-05  Karl Berry  <address@hidden>
 
+       * install-info/install-info.c (open_possibly_compressed_file):
+       free the original in the .gz and (found by Andreas Schwab, 05 Jan
+       2013 12:28:05) .xz cases too.  Reindent other parts of fn correctly.
+
        * doc/texinfo.txi (Chapter Structuring): node names with @
        throughout chapter.
 
@@ -9,7 +13,7 @@
        headings on off, paragraphindent, exampleindent): continue
        conversion to node names with @.
 
-2013-01-02  Thien-Thi Nguyen  <address@hidden>  (tiny change)
+2013-01-03  Thien-Thi Nguyen  <address@hidden>  (tiny change)
 
        * doc/texinfo.txi (Combining Indices):
        @synindex uses the "roman font for merged-from". 

Index: install-info/install-info.c
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/install-info.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- install-info/install-info.c 1 Jan 2013 19:31:57 -0000       1.21
+++ install-info/install-info.c 5 Jan 2013 23:46:38 -0000       1.22
@@ -1,5 +1,5 @@
 /* install-info -- merge Info directory entries from an Info file.
-   $Id: install-info.c,v 1.21 2013/01/01 19:31:57 karl Exp $
+   $Id: install-info.c,v 1.22 2013/01/05 23:46:38 karl Exp $
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013
@@ -683,11 +683,13 @@
   f = fopen (*opened_filename, FOPEN_RBIN);
   if (!f)
     {
+      free (*opened_filename);
       *opened_filename = concat (filename, ".gz", "");
       f = fopen (*opened_filename, FOPEN_RBIN);
     }
   if (!f)
     {
+      free (*opened_filename);
       *opened_filename = concat (filename, ".xz", "");
       f = fopen (*opened_filename, FOPEN_RBIN);
     }
@@ -716,7 +718,7 @@
           *opened_filename = concat (filename, ".inz", "");
           f = fopen (*opened_filename, FOPEN_RBIN);
         }
-#endif
+#endif /* __MSDOS__ */
       if (!f)
         {
           if (create_callback)