Reland 90618 - Remove check for entry_. From coverity CID=8237

Check result of inflateInit Coverity CID=14712 R=fischman@chromium.org Review URL: http://codereview.chromium.org/7253017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90696 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Jun 28, 2011 · afaeea9 · afaeea9
1 parent 111a1d6
commit afaeea9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc
@@ -1516,7 +1516,7 @@ int HttpCache::Transaction::BeginCacheValidation() {
     cache_->ConvertWriterToReader(entry_);
     mode_ = READ;
 
-    if (entry_ && entry_->disk_entry->GetDataSize(kMetadataIndex))
+    if (entry_->disk_entry->GetDataSize(kMetadataIndex))
       next_state_ = STATE_CACHE_READ_METADATA;
   } else {
     // Make the network request conditional, to see if we may reuse our cached

diff --git a/remoting/base/decompressor_zlib.cc b/remoting/base/decompressor_zlib.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -59,7 +59,8 @@ void DecompressorZlib::InitStream() {
   stream_->zfree = Z_NULL;
   stream_->opaque = Z_NULL;
 
-  inflateInit(stream_.get());
+  int ret = inflateInit(stream_.get());
+  DCHECK_EQ(ret, Z_OK);
 }
 
 }  // namespace remoting