Changeset 12505 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 31, 2006, 3:38:48 PM (19 years ago)

Author:

tomernic

Message:

Reviewed by Geoff Garen.

• bindings/c/c_utility.cpp: (KJS::Bindings::convertUTF8ToUTF16): Fixed an invalid assertion that UTF8Chars is not NULL. It is valid for it to be NULL as long as UTF8Length is 0. This fixes an assertion failure on TOT at <​http://www.musicindiaonline.com/p/x/tJO0OOBME9.As1NMvHdW/>, where JavaScript is getting a NULL string back from some call on the Real Player plugin.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/c/c_utility.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-01-31  Tim Omernick  <[email protected]>
+
+        Reviewed by Geoff Garen.
+
+        * bindings/c/c_utility.cpp:
+        (KJS::Bindings::convertUTF8ToUTF16):
+        Fixed an invalid assertion that UTF8Chars is not NULL.  It is valid for it to be NULL as long as
+        UTF8Length is 0.
+        This fixes an assertion failure on TOT at <http://www.musicindiaonline.com/p/x/tJO0OOBME9.As1NMvHdW/>,
+        where JavaScript is getting a NULL string back from some call on the Real Player plugin.
+
 2006-01-30  Anders Carlsson  <[email protected]>
 

trunk/JavaScriptCore/bindings/c/c_utility.cpp

@@ -44 +44 @@
 void convertUTF8ToUTF16(const NPUTF8 *UTF8Chars, int UTF8Length, NPUTF16 **UTF16Chars, unsigned int *UTF16Length)
 {
-    assert(UTF8Chars);
+    assert(UTF8Chars || UTF8Length == 0);
     
     if (UTF8Length == -1)