diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 20:03:52 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 20:03:52 +0000 |
| commit | 488488caed289935b86679542ef7c3399a4040f0 (patch) | |
| tree | e11bc94c87193ef59f7ea3424f32a5b2eeaa6ddd | |
| parent | c6e5f928c35b7fcd07c71f31694f83b90f210c46 (diff) | |
| download | chromium_src-488488caed289935b86679542ef7c3399a4040f0.zip chromium_src-488488caed289935b86679542ef7c3399a4040f0.tar.gz chromium_src-488488caed289935b86679542ef7c3399a4040f0.tar.bz2 | |
Revert 90618 - Add checks for entry_. From coverity CID=8237
Check result of inflateInit Coverity CID=14712
BUG=
TEST=
Review URL: http://codereview.chromium.org/7222027
TBR=gbillock@chromium.org
Review URL: http://codereview.chromium.org/7253014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90625 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/http/http_cache_transaction.cc | 2 | ||||
| -rw-r--r-- | remoting/base/decompressor_zlib.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index 7c5b09d..9af0c83 100644 --- 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_->disk_entry->GetDataSize(kMetadataIndex)) + if (entry_ && 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 index 212607d..770abd5 100644 --- a/remoting/base/decompressor_zlib.cc +++ b/remoting/base/decompressor_zlib.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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,7 @@ void DecompressorZlib::InitStream() { stream_->zfree = Z_NULL; stream_->opaque = Z_NULL; - DCHECK(inflateInit(stream_.get()) == Z_OK); + inflateInit(stream_.get()); } } // namespace remoting |