generic-library/breakpad
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove use of deprecated CFURLCreateDataAndPropertiesFromResource function.

Browse Source 
Original change (https://codereview.chromium.org/1527363003/) was failing
in CFReadStreamGetBuffer() call, so changed to CFReadStreamRead() to be
more conservative.

Patch provided by Scott Hancher.

BUG=
R=mark@chromium.org

Review URL: https://codereview.chromium.org/1637433003 .
This commit is contained in:
Ivan Penkov 2016-01-31 18:17:42 -08:00 committed by Mark Mentovai
parent 528035ae4e
commit 0291f06d41
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/client/mac/handler/minidump_generator.cc
View File

@ -142,12 +142,25 @@ void MinidumpGenerator::GatherSystemInformation() {
CFRelease(read_stream);
return;
}
CFDataRef data = NULL;
CFIndex num_bytes_read = 0;
const UInt8 *data_bytes =
CFReadStreamGetBuffer(read_stream, 0, &num_bytes_read);
if (data_bytes) {
data = CFDataCreate(NULL, data_bytes, num_bytes_read);
CFMutableDataRef data = NULL;
while (true) {
// Actual data file tests: Mac at 480 bytes and iOS at 413 bytes.
const CFIndex kMaxBufferLength = 1024;
UInt8 data_bytes[kMaxBufferLength];
CFIndex num_bytes_read =
CFReadStreamRead(read_stream, data_bytes, kMaxBufferLength);
if (num_bytes_read < 0) {
if (data) {
CFRelease(data);
data = NULL;
}
break;
} else if (num_bytes_read == 0) {
break;
} else if (!data) {
data = CFDataCreateMutable(NULL, 0);
}
CFDataAppendBytes(data, data_bytes, num_bytes_read);
}
CFReadStreamClose(read_stream);
CFRelease(read_stream);