diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-09 16:53:52 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-09 16:53:52 (GMT) |
| commit | aa46e5928b8fd97bada814e56134adb23a068b24 (patch) | |
| tree | df917faf833909ad09fc1b83ffde3ba9404dfd51 /src/3rdparty/webkit/JavaScriptCore/API/JSStringRefCF.cpp | |
| parent | b7c63e3d89006c9795835a79741b8d7a46891f93 (diff) | |
| parent | 5c53ea55e54f6371082a8ce7c3965f2fe54fcef5 (diff) | |
| download | Qt-aa46e5928b8fd97bada814e56134adb23a068b24.zip Qt-aa46e5928b8fd97bada814e56134adb23a068b24.tar.gz Qt-aa46e5928b8fd97bada814e56134adb23a068b24.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSStringRefCF.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/API/JSStringRefCF.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSStringRefCF.cpp b/src/3rdparty/webkit/JavaScriptCore/API/JSStringRefCF.cpp index 65edd09..d1f6fe3 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSStringRefCF.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSStringRefCF.cpp @@ -27,6 +27,7 @@ #include "JSStringRefCF.h" #include "APICast.h" +#include "InitializeThreading.h" #include "JSStringRef.h" #include "OpaqueJSString.h" #include <runtime/UString.h> @@ -35,7 +36,11 @@ JSStringRef JSStringCreateWithCFString(CFStringRef string) { - CFIndex length = CFStringGetLength(string); + JSC::initializeThreading(); + + // We cannot use CFIndex here since CFStringGetLength can return values larger than + // it can hold. (<rdar://problem/6806478>) + size_t length = CFStringGetLength(string); if (length) { OwnArrayPtr<UniChar> buffer(new UniChar[length]); CFStringGetCharacters(string, CFRangeMake(0, length), buffer.get()); @@ -44,7 +49,7 @@ JSStringRef JSStringCreateWithCFString(CFStringRef string) } else { return OpaqueJSString::create(0, 0).releaseRef(); } - } +} CFStringRef JSStringCopyCFString(CFAllocatorRef alloc, JSStringRef string) { |