commit ca0a9578b75b8c5b477efa7a8f2aa0d3bc9ed38a
author Alan Stokes <alanstokes@google.com> Mon Sep 06 07:55:58 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 06 07:55:58 2021 +0000
tree 9cfbbc1b5dfa7a4de859741ac6ad9c2f838d41e6
parent 60298b2face2dfa8b23042f1915ffc2fc471fbee
parent 359e3df62e4ee2583f40f011e0ea77d45804a3a7

Merge "Replace FakeCompOs with real CompOs"

keystore/Android.bp

diff --git a/keystore/Android.bp b/keystore/Android.bp
index 39208c6..ad4b4b1 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -102,5 +102,5 @@
 
     export_include_dirs: ["include"],
 
-    vendor_available: true,
+    vendor: true,
 }

keystore2/src/fuzzers/legacy_blob_fuzzer.rs

diff --git a/keystore2/src/fuzzers/legacy_blob_fuzzer.rs b/keystore2/src/fuzzers/legacy_blob_fuzzer.rs
index 5c89ca4..7e3e848 100644
--- a/keystore2/src/fuzzers/legacy_blob_fuzzer.rs
+++ b/keystore2/src/fuzzers/legacy_blob_fuzzer.rs
@@ -19,6 +19,8 @@
 use keystore2::legacy_blob::LegacyBlobLoader;
 
 fuzz_target!(|data: &[u8]| {
-    let string = data.iter().filter_map(|c| std::char::from_u32(*c as u32)).collect::<String>();
-    let _res = LegacyBlobLoader::decode_alias(&string);
+    if !data.is_empty() {
+        let string = data.iter().filter_map(|c| std::char::from_u32(*c as u32)).collect::<String>();
+        let _res = LegacyBlobLoader::decode_alias(&string);
+    }
 });