JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / API / JSStringRef.cpp

diff --git a/API/JSStringRef.cpp b/API/JSStringRef.cpp
index f31ed3dca7ec288fe36b78464dcca0251246a59e..c9b380ce654159d3cd11ebe259046bc691ed0ffa 100644 (file)
--- a/API/JSStringRef.cpp
+++ b/API/JSStringRef.cpp
@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
 JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
 {
     initializeThreading();
 JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
 {
     initializeThreading();

-    return OpaqueJSString::create(chars, numChars).leakRef();
+    return &OpaqueJSString::create(chars, numChars).leakRef();

 }
 
 JSStringRef JSStringCreateWithUTF8CString(const char* string)
 }
 
 JSStringRef JSStringCreateWithUTF8CString(const char* string)


@@ -51,12 +51,12 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
         const LChar* stringStart = reinterpret_cast<const LChar*>(string);
         if (conversionOK == convertUTF8ToUTF16(&string, string + length, &p, p + length, &sourceIsAllASCII)) {
             if (sourceIsAllASCII)
         const LChar* stringStart = reinterpret_cast<const LChar*>(string);
         if (conversionOK == convertUTF8ToUTF16(&string, string + length, &p, p + length, &sourceIsAllASCII)) {
             if (sourceIsAllASCII)

-                return OpaqueJSString::create(stringStart, length).leakRef();
-            return OpaqueJSString::create(buffer.data(), p - buffer.data()).leakRef();
+                return &OpaqueJSString::create(stringStart, length).leakRef();
+            return &OpaqueJSString::create(buffer.data(), p - buffer.data()).leakRef();

         }
     }
 
         }
     }
 

-    return OpaqueJSString::create().leakRef();
+    return &OpaqueJSString::create().leakRef();

 }
 
 JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
 }
 
 JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)


@@ -78,11 +78,15 @@ void JSStringRelease(JSStringRef string)
 
 size_t JSStringGetLength(JSStringRef string)
 {
 
 size_t JSStringGetLength(JSStringRef string)
 {

+    if (!string)
+        return 0;

     return string->length();
 }
 
 const JSChar* JSStringGetCharactersPtr(JSStringRef string)
 {
     return string->length();
 }
 
 const JSChar* JSStringGetCharactersPtr(JSStringRef string)
 {

+    if (!string)
+        return nullptr;

     return string->characters();
 }
 
     return string->characters();
 }
 


@@ -94,7 +98,7 @@ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
 
 size_t JSStringGetUTF8CString(JSStringRef string, char* buffer, size_t bufferSize)
 {
 
 size_t JSStringGetUTF8CString(JSStringRef string, char* buffer, size_t bufferSize)
 {

-    if (!bufferSize)
+    if (!string || !buffer || !bufferSize)

         return 0;
 
     char* destination = buffer;
         return 0;
 
     char* destination = buffer;