From 33b07ba96c6a22bdd4a1132c0b15b25873fc0c26 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Wed, 5 Sep 2018 08:04:01 -0700 Subject: [PATCH 1/2] UsbTransportSniffer: Defensively use 'final' UsbTransportSniffer invokes the virtual method Close() within its destructor. This usage is fine right now, but if a future class inherited from UsbTransportSniffer and overrode the Close() method, then this destructor would not act as expected. To protect against this, we declare Close() 'final' in UsbTransportSniffer, and add a comment. Test: Treehugger Change-Id: I6182d84e7caf67cb06f37c22c6203ad6d6e57f34 --- fastboot/fuzzy_fastboot/usb_transport_sniffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastboot/fuzzy_fastboot/usb_transport_sniffer.h b/fastboot/fuzzy_fastboot/usb_transport_sniffer.h index 89cc00993..8119aea39 100644 --- a/fastboot/fuzzy_fastboot/usb_transport_sniffer.h +++ b/fastboot/fuzzy_fastboot/usb_transport_sniffer.h @@ -72,7 +72,7 @@ class UsbTransportSniffer : public UsbTransport { 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 Transfers(); From 5b0bf8ae55a0f7a40c0bcd10056561a1ddb713c5 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Thu, 6 Sep 2018 06:14:35 -0700 Subject: [PATCH 2/2] logcat: Fix buffer size We need an additional byte for the NUL terminator in two buffers. Test: TreeHugger Change-Id: I891f64fb29170c803da65743d6b911b69ce6e4f4 --- logcat/tests/logcat_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp index c44e4416b..bebcc7192 100644 --- a/logcat/tests/logcat_test.cpp +++ b/logcat/tests/logcat_test.cpp @@ -1230,7 +1230,7 @@ TEST(logcat, blocking_clear) { } 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),"