From cfd86b747d32ac22246a1aa908eaa720c63a88c1 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Wed, 7 Nov 2012 11:22:47 +0100
Subject: Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876
 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
---
 Source/JavaScriptCore/API/JSStringRef.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Source/JavaScriptCore/API/JSStringRef.cpp')

diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
index da1a3057a..7f2168dc2 100644
--- a/Source/JavaScriptCore/API/JSStringRef.cpp
+++ b/Source/JavaScriptCore/API/JSStringRef.cpp
@@ -47,9 +47,10 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
         Vector<UChar, 1024> buffer(length);
         UChar* p = buffer.data();
         bool sourceIsAllASCII;
+        const LChar* stringStart = reinterpret_cast<const LChar*>(string);
         if (conversionOK == convertUTF8ToUTF16(&string, string + length, &p, p + length, &sourceIsAllASCII)) {
             if (sourceIsAllASCII)
-                return OpaqueJSString::create(reinterpret_cast<const LChar*>(string), length).leakRef();
+                return OpaqueJSString::create(stringStart, length).leakRef();
             return OpaqueJSString::create(buffer.data(), p - buffer.data()).leakRef();
         }
     }
-- 
cgit v1.2.1