content/browser/tracing/tracing_controller_impl_data_sinks.cc - Issue 2193323002: Tracing: fix error checking from deflate() when compressing trace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/tracing/tracing_controller_impl_data_sinks.cc

Issue 2193323002: Tracing: fix error checking from deflate() when compressing trace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: content/browser/tracing/tracing_controller_impl_data_sinks.cc

diff --git a/content/browser/tracing/tracing_controller_impl_data_sinks.cc b/content/browser/tracing/tracing_controller_impl_data_sinks.cc

index 86f0df224ba888da6fb8b8e8458301ddfc6316ae..ccc32f44dd73c1c8bc0589d0fcf9c13369f00667 100644

--- a/content/browser/tracing/tracing_controller_impl_data_sinks.cc

+++ b/content/browser/tracing/tracing_controller_impl_data_sinks.cc

@@ -252,7 +252,8 @@ class CompressedTraceDataEndpoint : public TraceDataEndpoint {

stream_->avail_out = kChunkSize;

stream_->next_out = (unsigned char*)buffer;

err = deflate(stream_.get(), finished ? Z_FINISH : Z_NO_FLUSH);

- if (err != (finished ? Z_STREAM_END : Z_OK)) {

+ if (err != Z_OK && (!finished || err != Z_STREAM_END)) {

+ LOG(ERROR) << "Deflate sream error: " << err;

shatch 2016/07/29 18:46:45 nit: sream

stream_.reset();

return;

}

« no previous file with comments | « no previous file | tools/valgrind/gtest_exclude/browser_tests.gtest-drmemory.txt » ('j') | no next file with comments »