Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-15 14:34:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a multiplicative overflow in color.rs

Browse source 
Also add a test.
This commit is contained in:
ridiculousfish 2023-05-29 13:22:46 -07:00
parent 3b55563769
commit 3d447dec3a
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
fish-rust/src/color.rs
View file

@ -319,8 +319,10 @@ const NAMED_COLORS: &[NamedColor] = &[
assert_sorted_by_name!(NAMED_COLORS); assert_sorted_by_name!(NAMED_COLORS);
fn convert_color(color: Color24, colors: &[u32]) -> usize { fn convert_color(color: Color24, colors: &[u32]) -> usize {
fn squared_difference(a: u8, b: u8) -> u16 { fn squared_difference(a: u8, b: u8) -> u32 {
u16::from(a.abs_diff(b)).pow(2) let a = u32::from(a);
let b = u32::from(b);
a.abs_diff(b).pow(2)
} }
colors colors
@ -402,7 +404,10 @@ fn term256_color_for_rgb(color: Color24) -> u8 {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::{color::RgbColor, wchar::widestrs}; use crate::{
color::{Color24, Flags, RgbColor, Type},
wchar::widestrs,
};
#[test] #[test]
#[widestrs] #[widestrs]
@ -419,4 +424,16 @@ mod tests {
assert!(RgbColor::from_wstr("MaGeNTa"L).unwrap().is_named()); assert!(RgbColor::from_wstr("MaGeNTa"L).unwrap().is_named());
assert!(RgbColor::from_wstr("mooganta"L).is_none()); assert!(RgbColor::from_wstr("mooganta"L).is_none());
} }
// Regression test for multiplicative overflow in convert_color.
#[test]
fn test_term16_color_for_rgb() {
for c in 0..=u8::MAX {
let color = RgbColor {
typ: Type::Rgb(Color24 { r: c, g: c, b: c }),
flags: Flags::DEFAULT,
};
let _ = color.to_name_index();
}
}
} }