Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/backend
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2008-04-08 09:49:07 (GMT)
committer Carlos Garcia Campos <carlosgc@src.gnome.org>2008-04-08 09:49:07 (GMT)
commitaf926e18f4cd9393fc32293f1065e8e41b996426 (patch)
tree00ef771b7a9c8a49f066fa635406f1edba2a1ecf /backend
parentd069b08079f06c8c062b9994ad97762d59829370 (diff)
Make sure link title is a valid utf8 string. Fixes bug #526517.
2008-04-08 Carlos Garcia Campos <carlosgc@gnome.org> * backend/djvu/djvu-links.c: (build_tree): Make sure link title is a valid utf8 string. Fixes bug #526517. svn path=/trunk/; revision=2996
Diffstat (limited to 'backend')
-rw-r--r--backend/djvu/djvu-links.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/djvu/djvu-links.c b/backend/djvu/djvu-links.c
index 6a516fc..4e3578e 100644
--- a/backend/djvu/djvu-links.c
+++ b/backend/djvu/djvu-links.c
@@ -169,16 +169,16 @@ build_tree (const DjvuDocument *djvu_document,
/* The (bookmarks) cons */
iter = miniexp_cdr (iter);
} else if ( miniexp_length (iter) >= 2 ) {
+ gchar *utf8_title = NULL;
+
/* An entry */
if (!string_from_miniexp (miniexp_car (iter), &title)) goto unknown_entry;
if (!string_from_miniexp (miniexp_cadr (iter), &link_dest)) goto unknown_entry;
+
if (!g_utf8_validate (title, -1, NULL)) {
- gchar *utf8_title;
-
utf8_title = str_to_utf8 (title);
title_markup = g_markup_escape_text (utf8_title, -1);
- g_free (utf8_title);
} else {
title_markup = g_markup_escape_text (title, -1);
}
@@ -188,7 +188,7 @@ build_tree (const DjvuDocument *djvu_document,
if (g_str_has_suffix (link_dest, ".djvu")) {
/* FIXME: component file identifiers */
} else if (ev_action) {
- ev_link = ev_link_new (title, ev_action);
+ ev_link = ev_link_new (utf8_title ? utf8_title : title, ev_action);
gtk_tree_store_append (GTK_TREE_STORE (model), &tree_iter, parent);
gtk_tree_store_set (GTK_TREE_STORE (model), &tree_iter,
EV_DOCUMENT_LINKS_COLUMN_MARKUP, title_markup,
@@ -205,7 +205,7 @@ build_tree (const DjvuDocument *djvu_document,
}
g_free (title_markup);
-
+ g_free (utf8_title);
iter = miniexp_cddr (iter);
parent = &tree_iter;
} else {