commit fc77fe935c1c88da980187d3c56602f546654f9b
author Greg Kaiser <gkaiser@google.com> Thu Sep 06 17:11:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 06 17:11:13 2018 +0000
tree 9e019fa53499fd6fe9fff1108d40c9cb509a227b
parent 3ffed5e8b2ba1483def05e8ca26f3ae22e19b72f
parent 20247cac90575105eaa5ffbc964fbccfd55b98dd

Merge changes I891f64fb,I6182d84e

* changes:
  logcat: Fix buffer size
  UsbTransportSniffer: Defensively use 'final'

fastboot/fuzzy_fastboot/usb_transport_sniffer.h

diff --git a/fastboot/fuzzy_fastboot/usb_transport_sniffer.h b/fastboot/fuzzy_fastboot/usb_transport_sniffer.h
index 89cc009..8119aea 100644
--- a/fastboot/fuzzy_fastboot/usb_transport_sniffer.h
+++ b/fastboot/fuzzy_fastboot/usb_transport_sniffer.h
@@ -72,7 +72,7 @@
 
     virtual ssize_t Read(void* data, size_t len) override;
     virtual ssize_t Write(const void* data, size_t len) override;
-    virtual int Close() override;
+    virtual int Close() override final;  // note usage in destructor
     virtual int Reset() override;
 
     const std::vector<Event> Transfers();

logcat/tests/logcat_test.cpp

diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp
index c44e441..bebcc71 100644
--- a/logcat/tests/logcat_test.cpp
+++ b/logcat/tests/logcat_test.cpp
@@ -1230,7 +1230,7 @@
         }
 
         int size, consumed, max, payload;
-        char size_mult[3], consumed_mult[3];
+        char size_mult[4], consumed_mult[4];
         size = consumed = max = payload = 0;
         if (6 == sscanf(buffer,
                         "events: ring buffer is %d %3s (%d %3s consumed),"