Bug#694662: unblock: libinfinity/0.5.2-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package libinfinity
0.5.2-6 fixes a crash of gobby-0.5 when the connection to the gobby server is
slow and if some text is selected towards the end of the buffer. This caused
crashes at both DebConf11 and at a recent BSP.
The change is pretty minimal.
unblock libinfinity/0.5.2-6
diff -Nru libinfinity-0.5.2/debian/changelog libinfinity-0.5.2/debian/changelog
--- libinfinity-0.5.2/debian/changelog 2012-10-24 00:08:40.000000000 +0200
+++ libinfinity-0.5.2/debian/changelog 2012-11-27 14:32:21.000000000 +0100
@@ -1,3 +1,11 @@
+libinfinity (0.5.2-6) unstable; urgency=low
+
+ * Add a patch that fixes a crash when trying to show a selection
+ towards the end of the document while this part is not available
+ yet. (Closes: #635712)
+
+ -- Philipp Kern <pkern@debian.org> Tue, 27 Nov 2012 14:28:02 +0100
+
libinfinity (0.5.2-5) unstable; urgency=low
* Fix a crash when a connection goes down while attempting to
diff -Nru libinfinity-0.5.2/debian/patches/0001-Fix-assertion-fail-at-drawing-selection.patch libinfinity-0.5.2/debian/patches/0001-Fix-assertion-fail-at-drawing-selection.patch
--- libinfinity-0.5.2/debian/patches/0001-Fix-assertion-fail-at-drawing-selection.patch 1970-01-01 01:00:00.000000000 +0100
+++ libinfinity-0.5.2/debian/patches/0001-Fix-assertion-fail-at-drawing-selection.patch 2012-11-27 14:32:47.000000000 +0100
@@ -0,0 +1,48 @@
+From b4321f8ae838809fc9bfee324e554415d5869f4e Mon Sep 17 00:00:00 2001
+From: Armin Burgmeier <armin@arbur.net>
+Date: Mon, 26 Nov 2012 11:23:59 +0100
+Subject: [PATCH] Fix assertion fail at drawing selection of not yet fully
+ synchronized document
+
+2012-11-26 Armin Burgmeier <armin@arbur.net>
+
+ * libinftextgtk/inf-text-gtk-view.c: Fix assertion fail at drawing selection
+ of not yet fully synchronized document.
+---
+ ChangeLog | 5 +++++
+ libinftextgtk/inf-text-gtk-view.c | 12 +++++++-----
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/libinftextgtk/inf-text-gtk-view.c b/libinftextgtk/inf-text-gtk-view.c
+index d7917a9..10c51f1 100644
+--- a/libinftextgtk/inf-text-gtk-view.c
++++ b/libinftextgtk/inf-text-gtk-view.c
+@@ -971,11 +971,6 @@ inf_text_gtk_view_expose_event_after_cb(GtkWidget* widget,
+ if(sel > 0)
+ {
+ end = begin + sel;
+- g_assert(
+- end <= gtk_text_buffer_get_char_count(
+- gtk_text_view_get_buffer(priv->textview)
+- )
+- );
+ }
+ else
+ {
+@@ -985,6 +980,13 @@ inf_text_gtk_view_expose_event_after_cb(GtkWidget* widget,
+ begin += sel;
+ }
+
++ /* This can happen if the document is not yet fully loaded, i.e. synchronization
++ * is still in progress. */
++ if(begin > gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(priv->textview)))
++ begin = gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(priv->textview));
++ if(end > gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(priv->textview)))
++ end = gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(priv->textview));
++
+ begin = MIN(MAX(begin, area_begin), area_end);
+ end = MIN(MAX(end, area_begin), area_end);
+ g_assert(end >= begin);
+--
+1.7.10.4
+
diff -Nru libinfinity-0.5.2/debian/patches/series libinfinity-0.5.2/debian/patches/series
--- libinfinity-0.5.2/debian/patches/series 2012-10-24 00:04:19.000000000 +0200
+++ libinfinity-0.5.2/debian/patches/series 2012-11-27 14:27:58.000000000 +0100
@@ -1,6 +1,7 @@
0001-Check-for-libm-for-libinftextgtk.patch
0001-Fix-a-few-enumeration-type-registration.patch
0001-Fix-a-crash-when-a-connection-goes-down-while-attemp.patch
+0001-Fix-assertion-fail-at-drawing-selection.patch
0001-Rework-Gtk3-support.patch
0002-gtk3-test-Makefile.am.patch
0003-gtk3-docs.patch
Reply to: