Skip to content
Permalink
Browse files

a11y: Return correct start and end offsets

This modifies ev_page_accessible_get_range_for_boundary to ensure that
the start and end offsets it returns are within the allowed range.

https://bugzilla.gnome.org/show_bug.cgi?id=777992

origin commit:
https://git.gnome.org/browse/evince/commit/?id=e95a4e3
  • Loading branch information...
jascrain authored and raveit65 committed Mar 26, 2017
1 parent 7c7c7ef commit bc7af6015676aee9d14c2c4dd522c484c4551d2a
Showing with 9 additions and 6 deletions.
  1. +9 −6 libview/ev-page-accessible.c
@@ -543,32 +543,35 @@ ev_page_accessible_get_range_for_boundary (AtkText *text,
if (!log_attrs)
return;

if (offset < 0 || offset >= n_attrs)
return;

switch (boundary_type) {
case ATK_TEXT_BOUNDARY_CHAR:
start = offset;
end = offset + 1;
break;
case ATK_TEXT_BOUNDARY_WORD_START:
for (start = offset; start >= 0 && !log_attrs[start].is_word_start; start--);
for (end = offset + 1; end <= n_attrs && !log_attrs[end].is_word_start; end++);
for (start = offset; start > 0 && !log_attrs[start].is_word_start; start--);
for (end = offset + 1; end < n_attrs && !log_attrs[end].is_word_start; end++);
break;
case ATK_TEXT_BOUNDARY_SENTENCE_START:
for (start = offset; start >= 0; start--) {
for (start = offset; start > 0; start--) {
if (log_attrs[start].is_mandatory_break && treat_as_soft_return (view, self->priv->page, log_attrs, start - 1))
continue;
if (log_attrs[start].is_sentence_start)
break;
}
for (end = offset + 1; end <= n_attrs; end++) {
for (end = offset + 1; end < n_attrs; end++) {
if (log_attrs[end].is_mandatory_break && treat_as_soft_return (view, self->priv->page, log_attrs, end - 1))
continue;
if (log_attrs[end].is_sentence_start)
break;
}
break;
case ATK_TEXT_BOUNDARY_LINE_START:
for (start = offset; start >= 0 && !log_attrs[start].is_mandatory_break; start--);
for (end = offset + 1; end <= n_attrs && !log_attrs[end].is_mandatory_break; end++);
for (start = offset; start > 0 && !log_attrs[start].is_mandatory_break; start--);
for (end = offset + 1; end < n_attrs && !log_attrs[end].is_mandatory_break; end++);
break;
default:
/* The "END" boundary types are deprecated */

0 comments on commit bc7af60

Please sign in to comment.
You can’t perform that action at this time.