summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Smith <gnome@nextreality.net>2006-02-11 15:16:06 +0000
committerBrent Smith <bmsmith@src.gnome.org>2006-02-11 15:16:06 +0000
commit8e957bb8825367c729a17e3891215fe14ba0f588 (patch)
treefa7e4d29724f74202105ab1333a78723b20faeb0
parentb1177e0404bf88dae31268e25679318abc3d3cf2 (diff)
downloadyelp-8e957bb8825367c729a17e3891215fe14ba0f588.tar.gz
Committed a patch from Robert Harris to fix a crash.
2006-02-11 Brent Smith <gnome@nextreality.net> * src/yelp-toc-pager.c: (process_info_pending): Committed a patch from Robert Harris to fix a crash.
-rw-r--r--ChangeLog5
-rw-r--r--src/yelp-toc-pager.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 427fa992..922c913c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-11 Brent Smith <gnome@nextreality.net>
+
+ * src/yelp-toc-pager.c: (process_info_pending):
+ Committed a patch from Robert Harris to fix a crash.
+
2006-02-04 Brent Smith <gnome@nextreality.net>
* src/yelp-window.c: (pager_page_cb):
diff --git a/src/yelp-toc-pager.c b/src/yelp-toc-pager.c
index 17f4df52..8f1da635 100644
--- a/src/yelp-toc-pager.c
+++ b/src/yelp-toc-pager.c
@@ -1042,8 +1042,8 @@ process_info_pending (YelpTocPager *pager)
continue;
} else {
GIOChannel *channel;
- gchar *str;
- int len;
+ gchar *str = NULL;
+ gsize len;
gchar ** files;
gchar ** ptr;
xmlNodePtr tmp;
@@ -1064,7 +1064,7 @@ process_info_pending (YelpTocPager *pager)
}
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);