Guard against using g_strstrip on NULL. Fixes bug #317291.

[evince.git] / shell / ev-window-title.c

diff --git a/shell/ev-window-title.c b/shell/ev-window-title.c
index a7229e9d259f9dda40398733bd208a7a7aa6038f..2964f1414d571d2ebc2c57307254e17d4c92fbca 100644 (file)
--- a/shell/ev-window-title.c
+++ b/shell/ev-window-title.c
@@ -105,12 +105,14 @@ ev_window_title_update (EvWindowTitle *window_title)
                g_return_if_fail (page_cache != NULL);
                doc_title = (char *)ev_page_cache_get_title (page_cache);
 
-               doc_title = g_strstrip (doc_title);
-
                /* Make sure we get a valid title back */
-               if (doc_title && doc_title[0] != '\000' &&
-                   g_utf8_validate (doc_title, -1, NULL)) {
-                       title = g_strdup (doc_title);
+               if (doc_title != NULL) {
+                       doc_title = g_strstrip (doc_title);
+
+                       if (doc_title[0] != '\0' &&
+                           g_utf8_validate (doc_title, -1, NULL)) {
+                               title = g_strdup (doc_title);
+                       }
                }
        }