Interceptor callbacks bug fixes

buffer · buffer · commit 46a15d70040c · 2024-10-16T13:03:31.000+02:00
diff --git a/src/Wrapper.cpp b/src/Wrapper.cpp
@@ -290,11 +290,11 @@ v8::Intercepted CPythonObject::NamedGetter(v8::Local<v8::Name> prop, const v8::P
 
     py::object obj = CJavascriptObject::Wrap(info.Holder());
     if (PyGen_Check(obj.ptr()))
-        CALLBACK_RETURN_NOT_HANDLED(v8::Undefined(info.GetIsolate()));
+        CALLBACK_RETURN_HANDLED(v8::Undefined(info.GetIsolate()));
 
     v8::String::Utf8Value name(info.GetIsolate(), v8::Local<v8::String>::Cast(prop));
     if (*name == nullptr)
-        CALLBACK_RETURN_NOT_HANDLED(v8::Undefined(info.GetIsolate()));
+        CALLBACK_RETURN_HANDLED(v8::Undefined(info.GetIsolate()));
 
     PyObject *value = ::PyObject_GetAttrString(obj.ptr(), *name);
 
@@ -428,6 +428,7 @@ v8::Intercepted CPythonObject::NamedQuery(v8::Local<v8::Name> prop, const v8::Pr
     if (exists)
         CALLBACK_RETURN_HANDLED(v8::Integer::New(info.GetIsolate(), v8::None));
 
+    CALLBACK_RETURN_NOT_HANDLED(v8::Integer::New(info.GetIsolate(), v8::None));
     END_HANDLE_EXCEPTION(v8::Handle<v8::Integer>())
 }
 
@@ -554,7 +555,7 @@ v8::Intercepted CPythonObject::IndexedGetter(uint32_t index, const v8::PropertyC
 
     py::object obj = CJavascriptObject::Wrap(info.Holder());
     if (PyGen_Check(obj.ptr()))
-        CALLBACK_RETURN_NOT_HANDLED(v8::Undefined(info.GetIsolate()));
+        CALLBACK_RETURN_HANDLED(v8::Undefined(info.GetIsolate()));
 
     if (::PySequence_Check(obj.ptr()))
     {
@@ -586,6 +587,7 @@ v8::Intercepted CPythonObject::IndexedGetter(uint32_t index, const v8::PropertyC
         }
     }
 
+    CALLBACK_RETURN_NOT_HANDLED(v8::Undefined(info.GetIsolate()));
     END_HANDLE_EXCEPTION(v8::Undefined(info.GetIsolate()))
 }
 
@@ -615,7 +617,6 @@ v8::Intercepted CPythonObject::IndexedSetter(uint32_t index, v8::Local<v8::Value
     }
 
     CALLBACK_RETURN_HANDLED(value);
-
     END_HANDLE_EXCEPTION(v8::Undefined(info.GetIsolate()))
 }
 
@@ -652,6 +653,7 @@ v8::Intercepted CPythonObject::IndexedQuery(uint32_t index, const v8::PropertyCa
         }
     }
 
+    CALLBACK_RETURN_NOT_HANDLED(v8::Integer::New(info.GetIsolate(), v8::None));
     END_HANDLE_EXCEPTION(v8::Handle<v8::Integer>())
 }
 
@@ -678,6 +680,7 @@ v8::Intercepted CPythonObject::IndexedDeleter(uint32_t index, const v8::Property
         CALLBACK_RETURN_HANDLED(PyMapping_DelItemString(obj.ptr(), buf) == 0);
     }
 
+    CALLBACK_RETURN_NOT_HANDLED(v8::Handle<v8::Boolean>())
     END_HANDLE_EXCEPTION(v8::Handle<v8::Boolean>())
 }
 

Original file line number	Diff line number	Diff line change
`@@ -290,11 +290,11 @@ v8::Intercepted CPythonObject::NamedGetter(v8::Local<v8::Name> prop, const v8::P`
`290`	`290`
`291`	`291`	`py::object obj = CJavascriptObject::Wrap(info.Holder());`
`292`	`292`	`if (PyGen_Check(obj.ptr()))`
`293`		`- CALLBACK_RETURN_NOT_HANDLED(v8::Undefined(info.GetIsolate()));`
	`293`	`+ CALLBACK_RETURN_HANDLED(v8::Undefined(info.GetIsolate()));`
`294`	`294`
`295`	`295`	`v8::String::Utf8Value name(info.GetIsolate(), v8::Local<v8::String>::Cast(prop));`
`296`	`296`	`if (*name == nullptr)`
`297`		`- CALLBACK_RETURN_NOT_HANDLED(v8::Undefined(info.GetIsolate()));`
	`297`	`+ CALLBACK_RETURN_HANDLED(v8::Undefined(info.GetIsolate()));`
`298`	`298`
`299`	`299`	`PyObject value = ::PyObject_GetAttrString(obj.ptr(), name);`
`300`	`300`
`@@ -428,6 +428,7 @@ v8::Intercepted CPythonObject::NamedQuery(v8::Local<v8::Name> prop, const v8::Pr`
`428`	`428`	`if (exists)`
`429`	`429`	`CALLBACK_RETURN_HANDLED(v8::Integer::New(info.GetIsolate(), v8::None));`
`430`	`430`
	`431`	`+ CALLBACK_RETURN_NOT_HANDLED(v8::Integer::New(info.GetIsolate(), v8::None));`
`431`	`432`	`END_HANDLE_EXCEPTION(v8::Handle<v8::Integer>())`
`432`	`433`	`}`
`433`	`434`
`@@ -554,7 +555,7 @@ v8::Intercepted CPythonObject::IndexedGetter(uint32_t index, const v8::PropertyC`
`554`	`555`
`555`	`556`	`py::object obj = CJavascriptObject::Wrap(info.Holder());`
`556`	`557`	`if (PyGen_Check(obj.ptr()))`
`557`		`- CALLBACK_RETURN_NOT_HANDLED(v8::Undefined(info.GetIsolate()));`
	`558`	`+ CALLBACK_RETURN_HANDLED(v8::Undefined(info.GetIsolate()));`
`558`	`559`
`559`	`560`	`if (::PySequence_Check(obj.ptr()))`
`560`	`561`	`{`
`@@ -586,6 +587,7 @@ v8::Intercepted CPythonObject::IndexedGetter(uint32_t index, const v8::PropertyC`
`586`	`587`	`}`
`587`	`588`	`}`
`588`	`589`
	`590`	`+ CALLBACK_RETURN_NOT_HANDLED(v8::Undefined(info.GetIsolate()));`
`589`	`591`	`END_HANDLE_EXCEPTION(v8::Undefined(info.GetIsolate()))`
`590`	`592`	`}`
`591`	`593`
`@@ -615,7 +617,6 @@ v8::Intercepted CPythonObject::IndexedSetter(uint32_t index, v8::Local<v8::Value`
`615`	`617`	`}`
`616`	`618`
`617`	`619`	`CALLBACK_RETURN_HANDLED(value);`
`618`		`-`
`619`	`620`	`END_HANDLE_EXCEPTION(v8::Undefined(info.GetIsolate()))`
`620`	`621`	`}`
`621`	`622`
`@@ -652,6 +653,7 @@ v8::Intercepted CPythonObject::IndexedQuery(uint32_t index, const v8::PropertyCa`
`652`	`653`	`}`
`653`	`654`	`}`
`654`	`655`
	`656`	`+ CALLBACK_RETURN_NOT_HANDLED(v8::Integer::New(info.GetIsolate(), v8::None));`
`655`	`657`	`END_HANDLE_EXCEPTION(v8::Handle<v8::Integer>())`
`656`	`658`	`}`
`657`	`659`
`@@ -678,6 +680,7 @@ v8::Intercepted CPythonObject::IndexedDeleter(uint32_t index, const v8::Property`
`678`	`680`	`CALLBACK_RETURN_HANDLED(PyMapping_DelItemString(obj.ptr(), buf) == 0);`
`679`	`681`	`}`
`680`	`682`
	`683`	`+ CALLBACK_RETURN_NOT_HANDLED(v8::Handle<v8::Boolean>())`
`681`	`684`	`END_HANDLE_EXCEPTION(v8::Handle<v8::Boolean>())`
`682`	`685`	`}`
`683`	`686`