Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 03:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

added check on to_type methods so that they will not cause

Browse Source 
a crash when the type is wrong
This commit is contained in:
Kolten Pearson 2023-05-09 20:52:02 -06:00
parent d6bd147f6f
commit 101752c853
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
c_bindings/pocketpy_c.cpp
View File

@ -376,6 +376,10 @@ bool pkpy_to_int(pkpy_vm* vm_handle, int index, int* ret) {
index = lua_to_cstack_index(index, vm->c_data->size()); index = lua_to_cstack_index(index, vm->c_data->size());
PyObject* o = vm->c_data->begin()[index]; PyObject* o = vm->c_data->begin()[index];
if (!is_type(o, vm->tp_int))
throw Exception("TypeError", "pkpy_to_int on non int object");
if (ret != nullptr) if (ret != nullptr)
*ret = py_cast<int>(vm, o); *ret = py_cast<int>(vm, o);
@ -390,6 +394,10 @@ bool pkpy_to_float(pkpy_vm* vm_handle, int index, double* ret) {
index = lua_to_cstack_index(index, vm->c_data->size()); index = lua_to_cstack_index(index, vm->c_data->size());
PyObject* o = vm->c_data->begin()[index]; PyObject* o = vm->c_data->begin()[index];
if (!is_type(o, vm->tp_float))
throw Exception("TypeError", "pkpy_to_float on non float object");
if (ret != nullptr) if (ret != nullptr)
*ret = py_cast<double>(vm, o); *ret = py_cast<double>(vm, o);
@ -404,6 +412,9 @@ bool pkpy_to_bool(pkpy_vm* vm_handle, int index, bool* ret) {
index = lua_to_cstack_index(index, vm->c_data->size()); index = lua_to_cstack_index(index, vm->c_data->size());
PyObject* o = vm->c_data->begin()[index]; PyObject* o = vm->c_data->begin()[index];
if (!is_type(o, vm->tp_bool))
throw Exception("TypeError", "pkpy_to_bool on non bool object");
if (ret != nullptr) if (ret != nullptr)
*ret = py_cast<bool>(vm, o); *ret = py_cast<bool>(vm, o);
@ -418,6 +429,9 @@ bool pkpy_to_voidp(pkpy_vm* vm_handle, int index, void** ret) {
index = lua_to_cstack_index(index, vm->c_data->size()); index = lua_to_cstack_index(index, vm->c_data->size());
PyObject* o = vm->c_data->begin()[index]; PyObject* o = vm->c_data->begin()[index];
if (!is_type(o, VoidP::_type(vm)))
throw Exception("TypeError", "pkpy_to_voidp on non void* object");
if (ret != nullptr) if (ret != nullptr)
*ret = py_cast<void*>(vm, o); *ret = py_cast<void*>(vm, o);
@ -432,6 +446,9 @@ bool pkpy_to_string(pkpy_vm* vm_handle, int index, char** ret) {
index = lua_to_cstack_index(index, vm->c_data->size()); index = lua_to_cstack_index(index, vm->c_data->size());
PyObject* o = vm->c_data->begin()[index]; PyObject* o = vm->c_data->begin()[index];
if (!is_type(o, vm->tp_str))
throw Exception("TypeError", "pkpy_to_string on non string object");
if (ret != nullptr) { if (ret != nullptr) {
Str& s = py_cast<Str&>(vm, o); Str& s = py_cast<Str&>(vm, o);
*ret = s.c_str_dup(); *ret = s.c_str_dup();