From a782022d6ccd7b098881a3d3b1da1dad703e0045 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Tue, 12 Jan 2021 11:44:05 +0100 Subject: [PATCH] Use rtc::CopyOnWriteBuffer::MutableData instead of data in fuzzers Bug: webrtc:12334 Change-Id: I3df42998f5cf5c3b09ad3f6253cab34170d725bf Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/201380 Reviewed-by: Niels Moller Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#32947} --- test/fuzzers/flexfec_header_reader_fuzzer.cc | 2 +- test/fuzzers/forward_error_correction_fuzzer.cc | 4 ++-- test/fuzzers/ulpfec_generator_fuzzer.cc | 4 ++-- test/fuzzers/ulpfec_header_reader_fuzzer.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/fuzzers/flexfec_header_reader_fuzzer.cc b/test/fuzzers/flexfec_header_reader_fuzzer.cc index 7d710d972f..854cc8b811 100644 --- a/test/fuzzers/flexfec_header_reader_fuzzer.cc +++ b/test/fuzzers/flexfec_header_reader_fuzzer.cc @@ -27,7 +27,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) { std::min(size, static_cast(IP_PACKET_SIZE)); packet.pkt->data.SetSize(packet_size); packet.pkt->data.EnsureCapacity(IP_PACKET_SIZE); - memcpy(packet.pkt->data.data(), data, packet_size); + memcpy(packet.pkt->data.MutableData(), data, packet_size); FlexfecHeaderReader flexfec_reader; flexfec_reader.ReadFecHeader(&packet); diff --git a/test/fuzzers/forward_error_correction_fuzzer.cc b/test/fuzzers/forward_error_correction_fuzzer.cc index 09009e1649..04a459bc71 100644 --- a/test/fuzzers/forward_error_correction_fuzzer.cc +++ b/test/fuzzers/forward_error_correction_fuzzer.cc @@ -57,7 +57,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) { recovered_packet->pkt = rtc::scoped_refptr( new ForwardErrorCorrection::Packet()); recovered_packet->pkt->data.SetSize(kPacketSize); - memset(recovered_packet->pkt->data.data(), 0, kPacketSize); + memset(recovered_packet->pkt->data.MutableData(), 0, kPacketSize); recovered_packet->ssrc = kMediaSsrc; recovered_packet->seq_num = media_seqnum++; recovered_packets.emplace_back(recovered_packet); @@ -69,7 +69,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) { new ForwardErrorCorrection::Packet()); received_packet.pkt->data.SetSize(kPacketSize); received_packet.pkt->data.EnsureCapacity(IP_PACKET_SIZE); - uint8_t* packet_buffer = received_packet.pkt->data.data(); + uint8_t* packet_buffer = received_packet.pkt->data.MutableData(); uint8_t reordering; uint16_t seq_num_diff; uint8_t packet_type; diff --git a/test/fuzzers/ulpfec_generator_fuzzer.cc b/test/fuzzers/ulpfec_generator_fuzzer.cc index 9426ef0ad3..43d9450918 100644 --- a/test/fuzzers/ulpfec_generator_fuzzer.cc +++ b/test/fuzzers/ulpfec_generator_fuzzer.cc @@ -45,9 +45,9 @@ void FuzzOneInput(const uint8_t* data, size_t size) { packet.EnsureCapacity(IP_PACKET_SIZE); // Write a valid parsable header (version = 2, no padding, no extensions, // no CSRCs). - ByteWriter::WriteBigEndian(&packet[0], 2 << 6); + ByteWriter::WriteBigEndian(packet.MutableData(), 2 << 6); // Make sure sequence numbers are increasing. - ByteWriter::WriteBigEndian(&packet[2], seq_num++); + ByteWriter::WriteBigEndian(packet.MutableData() + 2, seq_num++); i += payload_size + rtp_header_length; const bool protect = data[i++] % 2 == 1; diff --git a/test/fuzzers/ulpfec_header_reader_fuzzer.cc b/test/fuzzers/ulpfec_header_reader_fuzzer.cc index 570fa321ac..243cb4ed70 100644 --- a/test/fuzzers/ulpfec_header_reader_fuzzer.cc +++ b/test/fuzzers/ulpfec_header_reader_fuzzer.cc @@ -27,7 +27,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) { std::min(size, static_cast(IP_PACKET_SIZE)); packet.pkt->data.SetSize(packet_size); packet.pkt->data.EnsureCapacity(IP_PACKET_SIZE); - memcpy(packet.pkt->data.data(), data, packet_size); + memcpy(packet.pkt->data.MutableData(), data, packet_size); UlpfecHeaderReader ulpfec_reader; ulpfec_reader.ReadFecHeader(&packet);