31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From ed0241a5307e83484e25c01a8027504ea4dc35f3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Nelson=20Ben=C3=ADtez=20Le=C3=B3n?= <nbenitezl@gmail.com>
|
|
Date: Thu, 21 Mar 2019 22:25:00 -0400
|
|
Subject: [PATCH] sidebar links: protect against NULL var reaching strcmp()
|
|
|
|
Protect against a valid case of index_expand being NULL,
|
|
by adding a NULL check prior to checking for empty string
|
|
with strcmp().
|
|
|
|
Fixes #1113
|
|
---
|
|
shell/ev-sidebar-links.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c
|
|
index 8955d19c..29d3997e 100644
|
|
--- a/shell/ev-sidebar-links.c
|
|
+++ b/shell/ev-sidebar-links.c
|
|
@@ -518,7 +518,7 @@ row_collapsed_cb (GtkTreeView *tree_view,
|
|
if (ev_metadata_get_string (metadata, "index-collapse", &index_collapse)) {
|
|
/* If collapsed row is not in 'index_collapse' we add it. */
|
|
if (g_strstr_len (index_collapse, -1, path_token) == NULL) {
|
|
- if (!strcmp (index_expand, ""))
|
|
+ if (!index_expand || !strcmp (index_expand, ""))
|
|
new_index = g_strconcat (index_collapse, path_token, NULL);
|
|
else
|
|
new_index = g_strconcat (index_collapse, path_token + 1, NULL);
|
|
--
|
|
2.20.1
|
|
|