prevent crash from CHECK fail in SetAcceptsGzip()

crowell · jeffkaufman · commit 0f772622b8f3 · 2015-12-15T14:02:53.000-05:00
this change prevents double writes to SetAcceptsGzip()
diff --git a/net/instaweb/rewriter/rewrite_driver.cc b/net/instaweb/rewriter/rewrite_driver.cc
@@ -311,8 +311,10 @@ void RewriteDriver::PopulateRequestContext() {
   if ((request_context_.get() != NULL && (request_headers_ != NULL))) {
     request_context_->SetAcceptsWebp(
         request_properties_->SupportsWebpRewrittenUrls());
-    request_context_->SetAcceptsGzip(request_properties_->AcceptsGzip());
-    request_context_->Freeze();
+    if (!request_context_->frozen()) {
+      request_context_->SetAcceptsGzip(request_properties_->AcceptsGzip());
+      request_context_->Freeze();
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,10 @@ void RewriteDriver::PopulateRequestContext() {`
`311`	`311`	`if ((request_context_.get() != NULL && (request_headers_ != NULL))) {`
`312`	`312`	`request_context_->SetAcceptsWebp(`
`313`	`313`	`request_properties_->SupportsWebpRewrittenUrls());`
`314`		`- request_context_->SetAcceptsGzip(request_properties_->AcceptsGzip());`
`315`		`- request_context_->Freeze();`
	`314`	`+ if (!request_context_->frozen()) {`
	`315`	`+ request_context_->SetAcceptsGzip(request_properties_->AcceptsGzip());`
	`316`	`+ request_context_->Freeze();`
	`317`	`+ }`
`316`	`318`	`}`
`317`	`319`	`}`
`318`	`320`