From 767d59155a5d834d22ccb7c7d439b418ffad5404 Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Wed, 22 Jan 2020 01:36:44 +0300 Subject: [PATCH] Fix stack overflow when printing shader error Fixes #3238. --- CHANGELOG.md | 1 + alacritty/src/renderer/mod.rs | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adbd2b3..a67a830 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Block selection starting from first column after beginning leaves the scrollback - Incorrect selection status of the first cell when selection is off screen - Backwards bracket selection +- Stack overflow when printing shader creation error ### Removed diff --git a/alacritty/src/renderer/mod.rs b/alacritty/src/renderer/mod.rs index d5d48b4..2a1d872 100644 --- a/alacritty/src/renderer/mod.rs +++ b/alacritty/src/renderer/mod.rs @@ -88,7 +88,11 @@ impl std::error::Error for Error { impl Display for Error { fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { - write!(f, "There was an error initializing the shaders: {}", self) + match self { + Error::ShaderCreation(err) => { + write!(f, "There was an error initializing the shaders: {}", err) + }, + } } }