Check legal boundaries of accessible pages

gpoo · raveit65 · commit e79d2665e8a4 · 2018-03-16T16:15:10.000+01:00
Fixes #302 Keep the accessible view end page under the limits of the document. Sometimes when a document is reloaded, it may have less pages making the end page higher than the actual number of pages. Fix end_page reset after reload a page When a document is reloaded, and the accessible end_page is higher than the number of pages, it must be re-initialized to the number of pages minus one because it refers to elements in an array. Fix https://bugzilla.gnome.org/show_bug.cgi?id=735744 origin commits: https://git.gnome.org/browse/evince/commit/?id=feff531 https://git.gnome.org/browse/evince/commit/?id=e6e0d29
diff --git a/libview/ev-view-accessible.c b/libview/ev-view-accessible.c
@@ -380,6 +380,13 @@ initialize_children (EvViewAccessible *self)
 		child = ev_page_accessible_new (self, i);
 		g_ptr_array_add (self->priv->children, child);
 	}
+        /* When a document is reloaded, it may have less pages.
+         * We need to update the end page accordingly to avoid
+         * invalid access to self->priv->children
+         * See https://bugzilla.gnome.org/show_bug.cgi?id=735744
+         */
+	if (self->priv->end_page >= n_pages)
+		self->priv->end_page = n_pages - 1;
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,13 @@ initialize_children (EvViewAccessible *self)`
`380`	`380`	`child = ev_page_accessible_new (self, i);`
`381`	`381`	`g_ptr_array_add (self->priv->children, child);`
`382`	`382`	`}`
	`383`	`+ /* When a document is reloaded, it may have less pages.`
	`384`	`+ * We need to update the end page accordingly to avoid`
	`385`	`+ * invalid access to self->priv->children`
	`386`	`+ * See https://bugzilla.gnome.org/show_bug.cgi?id=735744`
	`387`	`+ */`
	`388`	`+ if (self->priv->end_page >= n_pages)`
	`389`	`+ self->priv->end_page = n_pages - 1;`
`383`	`390`	`}`
`384`	`391`
`385`	`392`	`static void`