[5404] info: avoid coredumping when writing output to a file.

[Sergey Poznyakoff]

Revision: 5404
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5404
Author:   gray
Date:     2014-01-16 08:49:43 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
info: avoid coredumping when writing output to a file.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-01-09 21:58:13 UTC (rev 5403)
+++ trunk/ChangeLog     2014-01-16 08:49:43 UTC (rev 5404)
@@ -1,3 +1,8 @@
+2014-01-16  Sergey Poznyakoff  <address@hidden>
+
+       * info/info.c (show_error_node): Avoid coredumping when
+       writing output to a file.
+
 2014-01-09  Sergey Poznyakoff  <address@hidden>
 
        Fix search boundary checking.

Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c   2014-01-09 21:58:13 UTC (rev 5403)
+++ trunk/info/info.c   2014-01-16 08:49:43 UTC (rev 5404)
@@ -859,8 +859,14 @@
 {
   if (info_error_rings_bell_p)
     terminal_ring_bell ();
-  if (!echo_area_is_active)
+  if (user_output_filename)
     {
+      if (node->contents[node->nodelen - 1] == '\n')
+        node->contents[node->nodelen - 1] = 0;
+      info_error ("%s", node->contents);
+    }
+  else if (!echo_area_is_active)
+    {
       free_echo_area ();
       window_set_node_of_window (the_echo_area, node);
       display_update_one_window (the_echo_area);