ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: fix undefined behavior"

Browse source
This commit is contained in:
Treehugger Robot 2016-10-20 04:32:51 +00:00 • committed by Gerrit Code Review
commit 1edd61ce5d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/shell_service_protocol_test.cpp
View file

@ -86,9 +86,10 @@ sig_t ShellProtocolTest::saved_sigpipe_handler_ = nullptr;
namespace { namespace {
// Returns true if the packet contains the given values. // Returns true if the packet contains the given values. `data` can't be null.
bool PacketEquals(const ShellProtocol* protocol, ShellProtocol::Id id, bool PacketEquals(const ShellProtocol* protocol, ShellProtocol::Id id,
const void* data, size_t data_length) { const void* data, size_t data_length) {
// Note that passing memcmp null is bad, even if data_length is 0.
return (protocol->id() == id && return (protocol->id() == id &&
protocol->data_length() == data_length && protocol->data_length() == data_length &&
!memcmp(data, protocol->data(), data_length)); !memcmp(data, protocol->data(), data_length));
@ -130,7 +131,8 @@ TEST_F(ShellProtocolTest, ZeroLengthPacket) {
ASSERT_TRUE(write_protocol_->Write(id, 0)); ASSERT_TRUE(write_protocol_->Write(id, 0));
ASSERT_TRUE(read_protocol_->Read()); ASSERT_TRUE(read_protocol_->Read());
ASSERT_TRUE(PacketEquals(read_protocol_, id, nullptr, 0)); char buf[1];
ASSERT_TRUE(PacketEquals(read_protocol_, id, buf, 0));
} }
// Tests exit code packets. // Tests exit code packets.