tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove usage of slice_internals feature

Browse source 
This CL replaces the usage of the core::slice::memchr function with
calls to std::iter::position.

Test: m keystore2_unsafe_fuzzer
Test: TH
Bug: 267698452
Change-Id: I33cab09176d0ff02ce092e240e887ece98728915
This commit is contained in:
Chris Wailes 2023-03-06 12:25:35 -08:00
parent 71e6c96283
commit bac435591f
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
keystore2/src/fuzzers/keystore2_unsafe_fuzzer.rs
View file

@ -14,11 +14,9 @@
//! Fuzzes unsafe APIs of libkeystore2 module //! Fuzzes unsafe APIs of libkeystore2 module
#![feature(slice_internals)]
#![no_main] #![no_main]
use binder::get_declared_instances; use binder::get_declared_instances;
use core::slice::memchr;
use keystore2::{legacy_blob::LegacyBlobLoader, utils::ui_opts_2_compat}; use keystore2::{legacy_blob::LegacyBlobLoader, utils::ui_opts_2_compat};
use keystore2_aaid::get_aaid; use keystore2_aaid::get_aaid;
use keystore2_apc_compat::ApcHal; use keystore2_apc_compat::ApcHal;
@ -38,7 +36,7 @@ const MAX_SIZE_MODIFIER: usize = 1024;
/// CString does not contain any internal 0 bytes /// CString does not contain any internal 0 bytes
fn get_valid_cstring_data(data: &[u8]) -> &[u8] { fn get_valid_cstring_data(data: &[u8]) -> &[u8] {
match memchr::memchr(0, data) { match data.iter().position(|&b| b == 0) {
Some(idx) => &data[0..idx], Some(idx) => &data[0..idx],
None => data, None => data,
} }