Snap for 8730993 from a3db049d695853c552bab755abac14daf21c6af5 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: If3114f313d8efcacf3ed7088fd214461d3e04619

3 files changed, 7 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 036545c..692be12 100644
--- a/Android.bp
+++ b/Android.bp
@@ -96,9 +96,4 @@ cc_library {
         },
     },
     min_sdk_version: "29",
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.media",
-        "com.android.media.swcodec",
-    ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 0f98962..d58e4e0 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,8 +1,6 @@
 {
     "presubmit": [
-        // uses ubsan sanitizers, which are no longer populated in the base system image
-        // TODO(b/221936773)
-        // { "name": "oob_oggpack_look" }
+        { "name": "oob_oggpack_look" }
     ],
 
     // tests which require dynamic content
diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c
index ae5500a..3c03f28 100644
--- a/Tremolo/codebook.c
+++ b/Tremolo/codebook.c
@@ -906,7 +906,12 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a,
         a[i++]=v[j];
     }
   }else{
-    memset(a, 0, sizeof(*a) * n);
+    int i,j;
+
+    for(i=0;i<n;){
+      for (j=0;j<book->dim && i < n;j++)
+        a[i++]=0;
+    }
   }
 
   return 0;