Snap for 6439596 from 79d0acf62e249d4d3b38cd41e5b47bdee336145a to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I56c6a2ef3e0f0c9b42f3f502b9b3c7102278e313

4 files changed, 2 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 9f68463..d0e5933 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,15 +33,8 @@ cc_defaults {
 cc_library_static {
     name: "libbspatch",
     defaults: ["bsdiff_defaults"],
-    vendor_available: true,
     recovery_available: true,
 
-    visibility: [
-        "//bootable/recovery:__subpackages__",
-        "//external/puffin:__subpackages__",
-        "//system/update_engine:__subpackages__",
-    ],
-
     srcs: [
         "brotli_decompressor.cc",
         "bspatch.cc",
diff --git a/OWNERS b/OWNERS
index ab036c1..ef9a19a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,3 @@
 deymo@google.com
 senj@google.com
-xunchang@google.com
+tbao@google.com
diff --git a/bsdiff_arguments.cc b/bsdiff_arguments.cc
index 7ea9b6d..20e6149 100644
--- a/bsdiff_arguments.cc
+++ b/bsdiff_arguments.cc
@@ -75,7 +75,7 @@ bool BsdiffArguments::IsValid() const {
 
 bool BsdiffArguments::ParseCommandLine(int argc, char** argv) {
   int opt;
-  int option_index = 0;
+  int option_index;
   while ((opt = getopt_long(argc, argv, "", OPTIONS, &option_index)) != -1) {
     if (opt != 0) {
       return false;
diff --git a/bspatch.cc b/bspatch.cc
index d7f1710..d552dcf 100644
--- a/bspatch.cc
+++ b/bspatch.cc
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:
 #include <fcntl.h>
 #include <inttypes.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -330,8 +329,6 @@ int bspatch(const std::unique_ptr<FileInterface>& old_file,
 
     // Adjust pointers.
     newpos += control_entry.diff_size;
-    if (oldpos > INT64_MAX - static_cast<int64_t>(control_entry.diff_size))
-      return 2;
     oldpos += control_entry.diff_size;
 
     if (oldpos > static_cast<int64_t>(old_file_size)) {
@@ -361,9 +358,6 @@ int bspatch(const std::unique_ptr<FileInterface>& old_file,
 
     // Adjust pointers.
     newpos += control_entry.extra_size;
-    if (control_entry.offset_increment > 0 &&
-        oldpos > INT64_MAX - control_entry.offset_increment)
-      return 2;
     oldpos += control_entry.offset_increment;
   }