Merge 30496 - First attempt at fixing a crash that occurs when we get into We...

webkit/glue/webframeloaderclient_impl.cc

 // Copyright (c) 2006-2008 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.
 
 #include "config.h"
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 
@@ skipping 610 matching lines @@
   // some events for our delegate.
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   WebViewDelegate* d = webview->delegate();
   if (d)
     d->DidStartLoading(webview);
 
   WebDataSourceImpl* ds = webframe_->GetDataSourceImpl();
   DCHECK(ds) << "DataSource NULL when navigating to reference fragment";
   if (ds) {
     GURL url = ds->request().url();
-    GURL chain_end = ds->GetEndOfRedirectChain();
-    ds->ClearRedirectChain();
+    GURL chain_end;
+
+    if (ds->HasRedirectChain()){
+      chain_end = ds->GetEndOfRedirectChain();
+      ds->ClearRedirectChain();
+    }
+
 
     // Figure out if this location change is because of a JS-initiated client
     // redirect (e.g onload/setTimeout document.location.href=).
     // TODO(timsteele): (bugs 1085325, 1046841) We don't get proper redirect
     // performed/cancelled notifications across anchor navigations, so the
     // other redirect-tracking code in this class (see dispatch*ClientRedirect()
     // and dispatchDidStartProvisionalLoad) is insufficient to catch and
     // properly flag these transitions. Once a proper fix for this bug is
     // identified and applied the following block may no longer be required.
     bool was_client_redirect =
@@ skipping 902 matching lines @@
 
   std::string offset_str = url.ExtractFileName();
   int offset;
   if (!StringToInt(offset_str, &offset))
     return;
 
   WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate();
   if (d)
     d->NavigateBackForwardSoon(offset);
 }