diff options
| author | Steve Block <steveblock@google.com> | 2011-08-08 17:48:18 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-08-08 17:49:26 +0100 |
| commit | 1b90d74d66fbb55d40e5e87a84423acd81ab062a (patch) | |
| tree | 531212cdbd343290cf947d0e9fb85c5daf0acc7e /Source/WebCore/bridge | |
| parent | 6b9d05281a529f9cd3e527fb8d657b338bb4fd7a (diff) | |
| download | external_webkit-1b90d74d66fbb55d40e5e87a84423acd81ab062a.zip external_webkit-1b90d74d66fbb55d40e5e87a84423acd81ab062a.tar.gz external_webkit-1b90d74d66fbb55d40e5e87a84423acd81ab062a.tar.bz2 | |
Add missing calls to JavaInstance::end() in JavaNPObjectInvoke() and JavaNPObjectGetProperty()
Bug: 5006441
Change-Id: I2da7a6f626560416cf5cac0cde3193a9074fab0f
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 |