Fwd: Fix for crash in yelp 2.13.4-0ubuntu1

[Shaun McCance <shaunm gnome org>]

Sending to the list.  It will disappear if it's
only in my Inbox.  If you see leaks in there,
please open a bug.

--
Shaun

-------- Forwarded Message --------
From: Robert Harris <robert f harris blueyonder co uk>
To: Jerry Haltom <wasabi larvalstage net>
Cc: Shaun McCance <shaunm gnome org>
Subject: Fix for crash in yelp 2.13.4-0ubuntu1
Date: Thu, 09 Feb 2006 18:11:46 +0000

yelp version 2.13.4-0ubuntu1 built for amd64 crashes on my machine when 
it reads an info directory file. The following patch fixes it:

--- src/yelp-toc-pager.c.orig   2006-01-30 23:40:07.000000000 +0000
+++ src/yelp-toc-pager.c        2006-02-09 17:51:01.000000000 +0000
@@ -1042,8 +1042,8 @@
            continue;
        } else {
            GIOChannel *channel;
-           gchar *str;
-           int len;
+           gchar *str = NULL;
+           gsize len;
            gchar ** files;
            gchar ** ptr;
            xmlNodePtr tmp;
@@ -1064,7 +1064,7 @@
            }

            channel = yelp_io_channel_new_file (filename, NULL);
-           g_io_channel_read_to_end (channel, &str, (gsize *) &len, NULL);
+           g_io_channel_read_to_end (channel, &str, &len, NULL);
            g_io_channel_shutdown (channel, FALSE, NULL);

            files = g_strsplit (str, "\n", -1);

Also the program looks very leaky in memory which I could fix but I 
don't want to tread on anybody's toes!

Regards,

Robert