texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[5932] avoid premature free in dir_entry_of_infodir


From: Gavin D. Smith
Subject: [5932] avoid premature free in dir_entry_of_infodir
Date: Mon, 17 Nov 2014 23:42:05 +0000

Revision: 5932
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5932
Author:   gavin
Date:     2014-11-17 23:42:05 +0000 (Mon, 17 Nov 2014)
Log Message:
-----------
avoid premature free in dir_entry_of_infodir

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/dir.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-11-17 23:21:30 UTC (rev 5931)
+++ trunk/ChangeLog     2014-11-17 23:42:05 UTC (rev 5932)
@@ -1,5 +1,10 @@
 2014-11-17  Gavin Smith  <address@hidden>
 
+       * info/dir.c (dir_entry_of_infodir): Don't free a node too 
+       early.
+
+2014-11-17  Gavin Smith  <address@hidden>
+
        * info/session.c (incremental_search): Look up pressed keys in 
        info_keymap and echo_area_keymap.  Do not hard-code any keys for 
        particular commands.

Modified: trunk/info/dir.c
===================================================================
--- trunk/info/dir.c    2014-11-17 23:21:30 UTC (rev 5931)
+++ trunk/info/dir.c    2014-11-17 23:42:05 UTC (rev 5932)
@@ -291,7 +291,6 @@
       dir_node = info_get_node (dir_fullpath, "Top");
       free (dir_fullpath);
       entry = info_get_menu_entry_by_label (dir_node, label, 1);
-      free_history_node (dir_node);
       if (!entry)
         continue;
 
@@ -302,6 +301,8 @@
           free (entry->filename);
           entry->filename = entry_fullpath;
         }
+
+      free_history_node (dir_node);
       return entry;
     }
   return 0;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]