Changeset 9061 in webkit for trunk/JavaScriptCore/bindings/NP_jsobject.cpp

Timestamp:

Apr 26, 2005, 6:03:57 PM (20 years ago)

Author:

rjw

Message:

JavaScriptCore:

Fixed <rdar://problem/4098713> Scripting API is incompatible with Mozilla

We were incompatible with Mozilla's implementation of the scripting APIs in
two ways:

Their NPN_SetException has the following signature:

void NPN_SetException(NPObject *npobj, const NPUTF8 *message);

ours has:

void NPN_SetException (NPObject * npobj, const NPString *message);

Also, they expect the string returned from NPN_UTF8FromIdentifier() to be freed by caller.
We do not.

I changed both behaviors to match Mozilla.

Reviewed by Chris.

• bindings/NP_jsobject.cpp: (_NPN_SetException):
• bindings/npruntime.cpp: (_NPN_UTF8FromIdentifier): (_NPN_IntFromIdentifier): (_NPN_SetExceptionWithUTF8):
• bindings/npruntime.h:
• bindings/npruntime_impl.h:

WebKit:

Fixed <rdar://problem/4098713> Scripting API is incompatible with Mozilla

Reviewed by Chris.

• Plugins.subproj/npfunctions.h:
• Plugins.subproj/npruntime.h:

File:

• trunk/JavaScriptCore/bindings/NP_jsobject.cpp (modified) (1 diff)

trunk/JavaScriptCore/bindings/NP_jsobject.cpp

@@ -412 +412 @@
 }
 
-void _NPN_SetException (NPObject *o, NPString *message)
-{
-    if (o->_class == NPScriptObjectClass) {
-        JavaScriptObject *obj = (JavaScriptObject *)o; 
-        ExecState *exec = obj->executionContext->interpreter()->globalExec();
-        Interpreter::lock();
-        char *msg = (char *)malloc (message->UTF8Length + 1);
-        strncpy (msg, message->UTF8Characters, message->UTF8Length);
-        msg[message->UTF8Length] = 0;
-        Object err = Error::create(exec, GeneralError, msg);
-        free (msg);
+void _NPN_SetException (NPObject *o, const NPUTF8 *message)
+{
+    if (o->_class == NPScriptObjectClass) {
+        JavaScriptObject *obj = (JavaScriptObject *)o; 
+        ExecState *exec = obj->executionContext->interpreter()->globalExec();
+        Interpreter::lock();
+        Object err = Error::create(exec, GeneralError, message);
         exec->setException (err);
         Interpreter::unlock();