summaryrefslogtreecommitdiff
path: root/src/fe-text
diff options
context:
space:
mode:
authorNei <ailin.nemui@gmail.com>2017-03-04 20:35:17 +0000
committerNei <ailin.nemui@gmail.com>2017-03-04 20:35:17 +0000
commit7ef22687f9291ef10072cc55bc64e3db3ad5a546 (patch)
tree81d112e872b10ba5146f3a48962eea24ae8502f4 /src/fe-text
parent647ef193a896cc8a97d9bc664a6337b8b779f3c4 (diff)
parent98ead50b4eea7cda4b357f1c4b19a741205c6fa4 (diff)
downloadirssi-7ef22687f9291ef10072cc55bc64e3db3ad5a546.zip
Merge branch 'd-minor' into 'master'
Prevent some potential null-pointer deferences. See merge request !9
Diffstat (limited to 'src/fe-text')
-rw-r--r--src/fe-text/mainwindows-layout.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/fe-text/mainwindows-layout.c b/src/fe-text/mainwindows-layout.c
index 020969e6..fae02539 100644
--- a/src/fe-text/mainwindows-layout.c
+++ b/src/fe-text/mainwindows-layout.c
@@ -121,6 +121,8 @@ static void sig_layout_restore(void)
if (node == NULL) return;
sorted_config = get_sorted_windows_config(node);
+ if (sorted_config == NULL) return;
+
windows_count = g_slist_length(sorted_config);
/* calculate the saved terminal height */