commit fcaed0effab54fa6face42a1b55c26760df0a074
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 31 20:18:40 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 31 20:18:40 2020 +0000
tree c47dbf073321c33703bf1f0f6fc6bd960dfefa51
parent 1c5a205fda5c8e0d5f69f23d5711004ff37182f9
parent bd5a283ccd8181d28bc4b4a026abf8c9b9d9bbcb

Merge "logd: disable flaky tests"

adb/client/incremental.cpp

diff --git a/adb/client/incremental.cpp b/adb/client/incremental.cpp
index 3033059..60735f8 100644
--- a/adb/client/incremental.cpp
+++ b/adb/client/incremental.cpp
@@ -55,9 +55,10 @@
         return {};
     }
 
-    std::vector<char> invalid_signature;
+    auto [signature, tree_size] = read_id_sig_headers(fd);
 
-    if (st.st_size > kMaxSignatureSize) {
+    std::vector<char> invalid_signature;
+    if (signature.size() > kMaxSignatureSize) {
         if (!silent) {
             fprintf(stderr, "Signature is too long. Max allowed is %d. Abort.\n",
                     kMaxSignatureSize);
@@ -65,7 +66,6 @@
         return {std::move(fd), std::move(invalid_signature)};
     }
 
-    auto [signature, tree_size] = read_id_sig_headers(fd);
     if (auto expected = verity_tree_size_for_file(file_size); tree_size != expected) {
         if (!silent) {
             fprintf(stderr,