Bug 1766646 - Vendor libwebrtc from a782022d6c

Upstream commit: https://webrtc.googlesource.com/src/+/a782022d6ccd7b098881a3d3b1da1dad703e0045
    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 <[email protected]>
    Commit-Queue: Danil Chapovalov <[email protected]>
    Cr-Commit-Position: refs/heads/master@{#32947}
This commit is contained in:
Michael Froman authored and Connor Sheehan committed 2022-08-30 10:07:42 -04:00
1 parent b45f4d64b8
commit 1996815912
6 files changed
+11 -6

No files matched your search

+3
View File
@@ -2379,3 +2379,6 @@ b2460f2f3c
# MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
a68bfc5537
# MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
a782022d6c
+2
View File
@@ -1588,3 +1588,5 @@ libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwe
libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-04-27T18:59:12.043368.
# python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc
libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-04-27T19:00:06.874195.
# python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc
libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-04-27T19:01:07.241623.
@@ -27,7 +27,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) {
std::min(size, static_cast<size_t>(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);
@@ -57,7 +57,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) {
recovered_packet->pkt = rtc::scoped_refptr<ForwardErrorCorrection::Packet>(
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;
@@ -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<uint8_t>::WriteBigEndian(&packet[0], 2 << 6);
ByteWriter<uint8_t>::WriteBigEndian(packet.MutableData(), 2 << 6);
// Make sure sequence numbers are increasing.
ByteWriter<uint16_t>::WriteBigEndian(&packet[2], seq_num++);
ByteWriter<uint16_t>::WriteBigEndian(packet.MutableData() + 2, seq_num++);
i += payload_size + rtp_header_length;
const bool protect = data[i++] % 2 == 1;
@@ -27,7 +27,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) {
std::min(size, static_cast<size_t>(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);