diff options
| author | Steve Block <steveblock@google.com> | 2011-02-17 09:06:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-17 09:06:39 -0800 |
| commit | 7aed021d3442e74aedc738192c55d8978b2d9643 (patch) | |
| tree | 7801e8554b642ef58b280135c847003f833bb70e /WebCore/bindings/v8/V8NPUtils.cpp | |
| parent | 990373e4c55ba4f0312b5ab7974388d717d1907c (diff) | |
| parent | f7f6d6409be37f76dc308902285d24806dc87ef2 (diff) | |
| download | external_webkit-7aed021d3442e74aedc738192c55d8978b2d9643.zip external_webkit-7aed021d3442e74aedc738192c55d8978b2d9643.tar.gz external_webkit-7aed021d3442e74aedc738192c55d8978b2d9643.tar.bz2 | |
Merge "Merge WebKit at Chromium 9.0.597.106: Initial merge by Git"
Diffstat (limited to 'WebCore/bindings/v8/V8NPUtils.cpp')
| -rw-r--r-- | WebCore/bindings/v8/V8NPUtils.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/bindings/v8/V8NPUtils.cpp b/WebCore/bindings/v8/V8NPUtils.cpp index 8fa19d7..4fb0456 100644 --- a/WebCore/bindings/v8/V8NPUtils.cpp +++ b/WebCore/bindings/v8/V8NPUtils.cpp @@ -65,8 +65,9 @@ void convertV8ObjectToNPVariant(v8::Local<v8::Value> object, NPObject* owner, NP VOID_TO_NPVARIANT(*result); else if (object->IsString()) { v8::String::Utf8Value utf8(object); - char* utf8_chars = strdup(*utf8); - STRINGN_TO_NPVARIANT(utf8_chars, utf8.length(), *result); + char* utf8Chars = reinterpret_cast<char*>(malloc(utf8.length())); + memcpy(utf8Chars, *utf8, utf8.length()); + STRINGN_TO_NPVARIANT(utf8Chars, utf8.length(), *result); } else if (object->IsObject()) { DOMWindow* window = V8Proxy::retrieveWindow(V8Proxy::currentContext()); NPObject* npobject = npCreateV8ScriptObject(0, v8::Handle<v8::Object>::Cast(object), window); |