diff options
| author | Steve Block <steveblock@google.com> | 2011-08-10 09:27:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-10 09:27:16 -0700 |
| commit | fe1799574525deb3c8b300d8854a9d1fd2ff3639 (patch) | |
| tree | dd138167989105614bd59d7ab5093e815afdbb87 /Source/WebCore/bridge | |
| parent | 5c403a0d2cc6f6936b56beeb5f601fe21e837254 (diff) | |
| parent | 1b90d74d66fbb55d40e5e87a84423acd81ab062a (diff) | |
| download | external_webkit-fe1799574525deb3c8b300d8854a9d1fd2ff3639.zip external_webkit-fe1799574525deb3c8b300d8854a9d1fd2ff3639.tar.gz external_webkit-fe1799574525deb3c8b300d8854a9d1fd2ff3639.tar.bz2 | |
Merge "Add missing calls to JavaInstance::end() in JavaNPObjectInvoke() and JavaNPObjectGetProperty()"
Diffstat (limited to 'Source/WebCore/bridge')
| -rw-r--r-- | Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp b/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp index b86a090..b22d57f 100644 --- a/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp +++ b/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp @@ -137,8 +137,10 @@ bool JavaNPObjectInvoke(NPObject* obj, NPIdentifier identifier, const NPVariant* break; } } - if (!jMethod) + if (!jMethod) { + instance->end(); return false; + } JavaValue* jArgs = new JavaValue[argCount]; for (unsigned int i = 0; i < argCount; i++) @@ -181,8 +183,10 @@ bool JavaNPObjectGetProperty(NPObject* obj, NPIdentifier identifier, NPVariant* instance->begin(); JavaField* field = instance->getClass()->fieldNamed(name); free(name); // TODO: use NPN_MemFree - if (!field) + if (!field) { + instance->end(); return false; + } #if PLATFORM(ANDROID) // JSC does not seem to support returning object properties so we emulate that |