Raise a TypeError if user tries to push an integer from JS side to C/C++ function exported with embind and the integer (char/short/int/long) is out of bounds of the data type expected by the C++ function.

1 files changed, 10 insertions, 9 deletions

diff --git a/system/lib/embind/bind.cpp b/system/lib/embind/bind.cpp
index a5c878f5..417d9ffd 100755
--- a/system/lib/embind/bind.cpp
+++ b/system/lib/embind/bind.cpp
@@ -5,6 +5,7 @@
 #include <typeinfo>

 #include <algorithm>

 #include <emscripten/emscripten.h>

+#include <climits>

 

 using namespace emscripten;

 

@@ -44,15 +45,15 @@ EMSCRIPTEN_BINDINGS(native_and_builtin_types) {
     

     _embind_register_bool(TypeID<bool>::get(), "bool", true, false);

 

-    _embind_register_integer(TypeID<char>::get(), "char");

-    _embind_register_integer(TypeID<signed char>::get(), "signed char");

-    _embind_register_integer(TypeID<unsigned char>::get(), "unsigned char");

-    _embind_register_integer(TypeID<signed short>::get(), "short");

-    _embind_register_integer(TypeID<unsigned short>::get(), "unsigned short");

-    _embind_register_integer(TypeID<signed int>::get(), "int");

-    _embind_register_integer(TypeID<unsigned int>::get(), "unsigned int");

-    _embind_register_integer(TypeID<signed long>::get(), "long");

-    _embind_register_integer(TypeID<unsigned long>::get(), "unsigned long");

+    _embind_register_integer(TypeID<char>::get(), "char", CHAR_MIN, CHAR_MAX);

+    _embind_register_integer(TypeID<signed char>::get(), "signed char", SCHAR_MIN, SCHAR_MAX);

+    _embind_register_integer(TypeID<unsigned char>::get(), "unsigned char", 0, UCHAR_MAX);

+    _embind_register_integer(TypeID<signed short>::get(), "short", SHRT_MIN, SHRT_MAX);

+    _embind_register_integer(TypeID<unsigned short>::get(), "unsigned short", 0, USHRT_MAX);

+    _embind_register_integer(TypeID<signed int>::get(), "int", INT_MIN, INT_MAX);

+    _embind_register_integer(TypeID<unsigned int>::get(), "unsigned int", 0, UINT_MAX);

+    _embind_register_integer(TypeID<signed long>::get(), "long", LONG_MIN, LONG_MAX);

+    _embind_register_integer(TypeID<unsigned long>::get(), "unsigned long", 0, ULONG_MAX);

     

     _embind_register_float(TypeID<float>::get(), "float");

     _embind_register_float(TypeID<double>::get(), "double");