aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorr-c-f <ryan.farley@gmx.com>2021-01-11 06:42:06 -0600
committerGitHub <noreply@github.com>2021-01-11 12:42:06 +0000
commitaefffde539c0649e3ebe3a81b2e15a25e760d29c (patch)
treef70c1d07c1b218d0974d8a46da525bca036b7f6e
parent7045a1ec07634701ef75bcf7872bab3c9199b4f3 (diff)
downloadalacritty-aefffde539c0649e3ebe3a81b2e15a25e760d29c.tar.gz
alacritty-aefffde539c0649e3ebe3a81b2e15a25e760d29c.zip
Fix assertion crash on 32-bit systems
Fixes #4687.
-rw-r--r--CHANGELOG.md4
-rw-r--r--alacritty_terminal/src/grid/storage.rs2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b441b9b..9df5b3ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## 0.8.0-dev
+### Fixed
+
+- Crash due to assertion failure on 32-bit architectures
+
## 0.7.1
### Fixed
diff --git a/alacritty_terminal/src/grid/storage.rs b/alacritty_terminal/src/grid/storage.rs
index a7d4adcf..f9c4b2cf 100644
--- a/alacritty_terminal/src/grid/storage.rs
+++ b/alacritty_terminal/src/grid/storage.rs
@@ -156,7 +156,7 @@ impl<T> Storage<T> {
/// instructions. This implementation achieves the swap in only 8 movups
/// instructions.
pub fn swap(&mut self, a: usize, b: usize) {
- debug_assert_eq!(std::mem::size_of::<Row<T>>(), 32);
+ debug_assert_eq!(mem::size_of::<Row<T>>(), mem::size_of::<usize>() * 4);
let a = self.compute_index(a);
let b = self.compute_index(b);