From 75ac482cec7d73964e56c91fdcea6c138f3252a8 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Mon, 1 Jan 2018 13:00:00 +0100 Subject: [PATCH] Don't crash when setting fish_history before reader is initialized Not crashing is just soo much nicer. Fixes #4619. --- src/reader.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/reader.cpp b/src/reader.cpp index 6ca2450fd..806e3d6e7 100644 --- a/src/reader.cpp +++ b/src/reader.cpp @@ -1962,8 +1962,11 @@ static parser_test_error_bits_t default_test(const wchar_t *b) { } void reader_change_history(const wchar_t *name) { - data->history->save(); - data->history = &history_t::history_with_name(name); + // We don't need to _change_ if we're not initialized yet. + if (data && data->history) { + data->history->save(); + data->history = &history_t::history_with_name(name); + } } void reader_push(const wchar_t *name) {