admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EventLogParser: use std::vector to reduce stack usage

Browse Source 
ParsedRtcEventLog::ParseStream was using a stack-allocated 64kb array
for a temporary buffer. This was causing problems in build environments
with restrictions on stack size.

This change replaces it with an std::vector.

NOTRY=true

Review-Url: https://codereview.webrtc.org/2297343003
Cr-Commit-Position: refs/heads/master@{#14055}
This commit is contained in:
skvlad 2016-09-02 13:22:26 -07:00 committed by Commit bot
parent c55c39ddf7
commit 1afdf99f9c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/call/rtc_event_log_parser.cc
View File

@ -124,7 +124,7 @@ bool ParsedRtcEventLog::ParseString(const std::string& s) {
bool ParsedRtcEventLog::ParseStream(std::istream& stream) {
events_.clear();
const size_t kMaxEventSize = (1u << 16) - 1;
char tmp_buffer[kMaxEventSize];
std::vector<char> tmp_buffer(kMaxEventSize);
uint64_t tag;
uint64_t message_length;
bool success;
@ -162,7 +162,7 @@ bool ParsedRtcEventLog::ParseStream(std::istream& stream) {
}
// Read the next protobuf event to a temporary char buffer.
stream.read(tmp_buffer, message_length);
stream.read(tmp_buffer.data(), message_length);
if (stream.gcount() != static_cast<int>(message_length)) {
LOG(LS_WARNING) << "Failed to read protobuf message from file.";
return false;
@ -170,7 +170,7 @@ bool ParsedRtcEventLog::ParseStream(std::istream& stream) {
// Parse the protobuf event from the buffer.
rtclog::Event event;
if (!event.ParseFromArray(tmp_buffer, message_length)) {
if (!event.ParseFromArray(tmp_buffer.data(), message_length)) {
LOG(LS_WARNING) << "Failed to parse protobuf message.";
return false;
}