Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

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: disabled AboutTracingIntegrationTest on Win 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
« no previous file with comments | « no previous file | tools/perf/core/about_tracing_integration_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..db25c79d6e84b16e17a543f05d28882e61ae85e0 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 stream error: " << err;
stream_.reset();
return;
}
« no previous file with comments | « no previous file | tools/perf/core/about_tracing_integration_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698