Fix a null pointer crasher.

BUG=84616
Review URL: http://codereview.chromium.org/7054077

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88063 0039d316-1c4b-4281-b951-d872f2087c98

webkit/appcache/appcache_response.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -214,12 +214,16 @@ void AppCacheResponseReader::SetReadRange(int offset, int length) {
 void AppCacheResponseReader::OnIOComplete(int result) {
   if (result >= 0) {
     if (info_buffer_.get()) {
-      // Allocate and deserialize the http info structure.
+      // Deserialize the http info structure.
       Pickle pickle(buffer_->data(), result);
+      scoped_ptr<net::HttpResponseInfo> info(new net::HttpResponseInfo);
       bool response_truncated = false;
-      info_buffer_->http_info.reset(new net::HttpResponseInfo);
-      info_buffer_->http_info->InitFromPickle(pickle, &response_truncated);
+      if (!info->InitFromPickle(pickle, &response_truncated)) {
+        InvokeUserCompletionCallback(net::ERR_FAILED);
+        return;
+      }
       DCHECK(!response_truncated);
+      info_buffer_->http_info.reset(info.release());
 
       // Also return the size of the response body
       DCHECK(entry_);

webkit/appcache/appcache_update_job.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.
 
@@ -1180,7 +1180,8 @@ void AppCacheUpdateJob::OnResponseInfoLoaded(
     const std::string name = "vary";
     std::string value;
     void* iter = NULL;
-    if (http_info->headers->RequiresValidation(http_info->request_time,
+    if (!http_info->headers ||
+        http_info->headers->RequiresValidation(http_info->request_time,
                                                http_info->response_time,
                                                base::Time::Now()) ||
         http_info->headers->EnumerateHeader(&iter, name, &value)) {