[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 9e622ebbb84db4140382d37092bc0f389f873df3
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 30 22:53:12 2004 +0000

    	Fixed 3542044.  Create KJS::String using UString constructor instead of passing UTF8 string to char* constructor.
    
            Reviewed by Darin.
    
            * bindings/jni/jni_instance.cpp:
            (JavaInstance::stringValue):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6012 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 256983e..e1eff59 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-30  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3542044.  Create KJS::String using UString constructor instead of passing UTF8 string to char* constructor.
+
+        Reviewed by Darin.
+
+        * bindings/jni/jni_instance.cpp:
+        (JavaInstance::stringValue):
+
 2004-01-26  Darin Adler  <darin at apple.com>
 
         * Makefile.am: Switch from pbxbuild to xcodebuild.
diff --git a/JavaScriptCore/bindings/jni/jni_instance.cpp b/JavaScriptCore/bindings/jni/jni_instance.cpp
index e0cb434..239b354 100644
--- a/JavaScriptCore/bindings/jni/jni_instance.cpp
+++ b/JavaScriptCore/bindings/jni/jni_instance.cpp
@@ -83,9 +83,10 @@ KJS::Value JavaInstance::stringValue() const
 {
     jstring stringValue = (jstring)callJNIObjectMethod (_instance->_instance, "toString", "()Ljava/lang/String;");
     JNIEnv *env = getJNIEnv();
-    const char *c = getCharactersFromJStringInEnv (env, stringValue);
-    KJS::String v(c);
-    releaseCharactersForJStringInEnv (env, stringValue, c);
+    const UChar *c = (const UChar *)getUCharactersFromJStringInEnv (env, stringValue);
+    UString u(c, (int)env->GetStringLength(stringValue));
+    String v(u);
+    releaseUCharactersForJStringInEnv (env, stringValue, (const jchar *)c);
     return v;
 }
 

-- 
WebKit Debian packaging