SourceLocation: Fix use-after-move.

third_party/WebKit/Source/bindings/core/v8/SourceLocation.cpp

 // Copyright 2016 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 "bindings/core/v8/SourceLocation.h"
 
 #include "bindings/core/v8/V8BindingMacros.h"
 #include "bindings/core/v8/V8PerIsolateData.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
@@ skipping 24 matching lines @@
     return data->threadDebugger()->debugger()->captureStackTrace(stackSize);
 }
 
 }
 
 // static
 PassOwnPtr<SourceLocation> SourceLocation::capture(const String& url, unsigned lineNumber, unsigned columnNumber)
 {
     std::unique_ptr<V8StackTrace> stackTrace = captureStackTrace();
     if (stackTrace && !stackTrace->isEmpty())
-        return SourceLocation::create(stackTrace->topSourceURL(), stackTrace->topLineNumber(), stackTrace->topColumnNumber(), std::move(stackTrace), 0);
+        return SourceLocation::createFromNonEmptyV8StackTrace(std::move(stackTrace), 0);
     return SourceLocation::create(url, lineNumber, columnNumber, std::move(stackTrace));
 }
 
 // static
 PassOwnPtr<SourceLocation> SourceLocation::capture(ExecutionContext* executionContext)
 {
     std::unique_ptr<V8StackTrace> stackTrace = captureStackTrace();
     if (stackTrace && !stackTrace->isEmpty())
-        return SourceLocation::create(stackTrace->topSourceURL(), stackTrace->topLineNumber(), stackTrace->topColumnNumber(), std::move(stackTrace), 0);
+        return SourceLocation::createFromNonEmptyV8StackTrace(std::move(stackTrace), 0);
 
     Document* document = executionContext && executionContext->isDocument() ? toDocument(executionContext) : nullptr;
     if (document) {
         unsigned lineNumber = 0;
         if (document->scriptableDocumentParser() && !document->isInDocumentWrite()) {
             if (document->scriptableDocumentParser()->isParsingAtLineNumber())
                 lineNumber = document->scriptableDocumentParser()->lineNumber().oneBasedInt();
         }
         return SourceLocation::create(document->url().getString(), lineNumber, 0, std::move(stackTrace));
     }
@@ skipping 17 matching lines @@
             scriptId = 0;
     }
 
     int lineNumber = 0;
     int columnNumber = 0;
     if (v8Call(message->GetLineNumber(isolate->GetCurrentContext()), lineNumber)
         && v8Call(message->GetStartColumn(isolate->GetCurrentContext()), columnNumber))
         ++columnNumber;
 
     if ((!scriptId || !lineNumber) && stackTrace && !stackTrace->isEmpty())
-        return adoptPtr(new SourceLocation(stackTrace->topSourceURL(), stackTrace->topLineNumber(), stackTrace->topColumnNumber(), std::move(stackTrace), 0));
+        return SourceLocation::createFromNonEmptyV8StackTrace(std::move(stackTrace), 0);
 
     String url = toCoreStringWithUndefinedOrNullCheck(message->GetScriptOrigin().ResourceName());
     if (url.isNull())
         url = executionContext->url();
-    return adoptPtr(new SourceLocation(url, lineNumber, columnNumber, std::move(stackTrace), scriptId));
+    return SourceLocation::create(url, lineNumber, columnNumber, std::move(stackTrace), scriptId);
 }
 
 // static
 PassOwnPtr<SourceLocation> SourceLocation::create(const String& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTrace> stackTrace, int scriptId)
 {
     return adoptPtr(new SourceLocation(url, lineNumber, columnNumber, std::move(stackTrace), scriptId));
 }
 
+// static
+PassOwnPtr<SourceLocation> SourceLocation::createFromNonEmptyV8StackTrace(std::unique_ptr<V8StackTrace> stackTrace, int scriptId)
+{
+    // Retrieve the data before passing the ownership to SourceLocation.
+    const String& url = stackTrace->topSourceURL();
+    unsigned lineNumber = stackTrace->topLineNumber();
+    unsigned columnNumber = stackTrace->topColumnNumber();
+    return adoptPtr(new SourceLocation(url, lineNumber, columnNumber, std::move(stackTrace), scriptId));
+}
+
 SourceLocation::SourceLocation(const String& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTrace> stackTrace, int scriptId)
     : m_url(url)
     , m_lineNumber(lineNumber)
     , m_columnNumber(columnNumber)
     , m_stackTrace(std::move(stackTrace))
     , m_scriptId(scriptId)
 {
 }
 
 SourceLocation::~SourceLocation()
@@ skipping 14 matching lines @@
     value->endDictionary();
     value->endArray();
 }
 
 PassOwnPtr<SourceLocation> SourceLocation::clone() const
 {
     return adoptPtr(new SourceLocation(m_url, m_lineNumber, m_columnNumber, m_stackTrace ? m_stackTrace->clone() : nullptr, m_scriptId));
 }
 
 } // namespace blink