commit afafd332ee886981b955187b618dbdbf1b783cb1
author Tao Bao <tbao@google.com> Thu Sep 27 10:04:50 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Sep 27 10:04:50 2018 -0700
tree f4545b2e138a7c2416ea2a73494e01119a43690c
parent ff47ab3ca4c0838dbc136273d84c2dc2c1be256a
parent f4bf6302001cb41463a437c9aa3be481d9b9db86

Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload." am: b32bd8a333
am: f4bf630200

Change-Id: I7bf8b3f1d1947107d873e3efdc973c51ca120037

minadbd/minadbd_services.cpp

diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp
index ab1939e..e9c51da 100644
--- a/minadbd/minadbd_services.cpp
+++ b/minadbd/minadbd_services.cpp
@@ -33,19 +33,20 @@
 #include "sysdeps.h"
 
 static void sideload_host_service(unique_fd sfd, const std::string& args) {
-    int file_size;
-    int block_size;
-    if (sscanf(args.c_str(), "%d:%d", &file_size, &block_size) != 2) {
-        printf("bad sideload-host arguments: %s\n", args.c_str());
-        exit(1);
-    }
+  int64_t file_size;
+  int block_size;
+  if ((sscanf(args.c_str(), "%" SCNd64 ":%d", &file_size, &block_size) != 2) || file_size <= 0 ||
+      block_size <= 0) {
+    printf("bad sideload-host arguments: %s\n", args.c_str());
+    exit(1);
+  }
 
-    printf("sideload-host file size %d block size %d\n", file_size, block_size);
+  printf("sideload-host file size %" PRId64 " block size %d\n", file_size, block_size);
 
-    int result = run_adb_fuse(sfd, file_size, block_size);
+  int result = run_adb_fuse(sfd, file_size, block_size);
 
-    printf("sideload_host finished\n");
-    exit(result == 0 ? 0 : 1);
+  printf("sideload_host finished\n");
+  exit(result == 0 ? 0 : 1);
 }
 
 unique_fd daemon_service_to_fd(const char* name, atransport* /* transport */) {