From a576850a8aa8a3d4b5f22cbe4e8e195034da9330 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Sat, 20 Sep 2025 15:20:05 -0400 Subject: that's not the correct way apparently --- .../chromium/files/chromium-142-crabbyavif-rust18x.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'www-client/chromium/files') diff --git a/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch b/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch index 164e31f..da4dc76 100644 --- a/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch +++ b/www-client/chromium/files/chromium-142-crabbyavif-rust18x.patch @@ -1,5 +1,5 @@ diff --git a/third_party/crabbyavif/src/src/capi/io.rs b/third_party/crabbyavif/src/src/capi/io.rs -index e7994ce312..cb2f3cb578 100644 +index e7994ce312..60a3c13b78 100644 --- a/third_party/crabbyavif/src/src/capi/io.rs +++ b/third_party/crabbyavif/src/src/capi/io.rs @@ -207,7 +207,7 @@ impl Drop for avifIOWrapper { @@ -7,12 +7,12 @@ index e7994ce312..cb2f3cb578 100644 impl crate::decoder::IO for avifIOWrapper { - #[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))] -+ #[cfg_attr(feature = "disable_cfi")] ++ #[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))] fn read(&mut self, offset: u64, size: usize) -> AvifResult<&[u8]> { // SAFETY: Calling into a C function. let res = unsafe { diff --git a/third_party/crabbyavif/src/src/lib.rs b/third_party/crabbyavif/src/src/lib.rs -index 90fa411889..8dc9bf2066 100644 +index 90fa411889..a05f0a5e8b 100644 --- a/third_party/crabbyavif/src/src/lib.rs +++ b/third_party/crabbyavif/src/src/lib.rs @@ -13,7 +13,7 @@ @@ -20,12 +20,12 @@ index 90fa411889..8dc9bf2066 100644 #![deny(unsafe_op_in_unsafe_fn)] -#![cfg_attr(feature = "disable_cfi", feature(sanitize))] -+#![cfg_attr(feature = "disable_cfi")] ++#![cfg_attr(feature = "disable_cfi", feature(no_sanitize))] #[macro_use] mod internal_utils; diff --git a/third_party/crabbyavif/src/src/reformat/libyuv.rs b/third_party/crabbyavif/src/src/reformat/libyuv.rs -index 9df874ccf7..cb25214914 100644 +index 9df874ccf7..3f68c16f2b 100644 --- a/third_party/crabbyavif/src/src/reformat/libyuv.rs +++ b/third_party/crabbyavif/src/src/reformat/libyuv.rs @@ -372,7 +372,7 @@ fn find_conversion_function( @@ -33,7 +33,7 @@ index 9df874ccf7..cb25214914 100644 // needs to be imported separately. // Returns Ok(None) if the conversion is not implemented. -#[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))] -+#[cfg_attr(feature = "disable_cfi")] ++#[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))] pub(crate) fn yuv_to_rgb(image: &image::Image, rgb: &mut rgb::Image) -> AvifResult> { if (rgb.depth != 8 && rgb.depth != 10) || !image.depth_valid() { return Ok(None); // Not implemented. @@ -42,7 +42,7 @@ index 9df874ccf7..cb25214914 100644 } -#[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))] -+#[cfg_attr(feature = "disable_cfi")] ++#[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))] pub(crate) fn rgb_to_yuv(rgb: &rgb::Image, image: &mut image::Image) -> AvifResult> { let conversion_function = match rgb_to_yuv_conversion_function(rgb, image) { Some(conversion_function) => conversion_function, -- cgit v1.2.3