3 files changed, 21 insertions, 11 deletions
diff --git a/src/embind/embind.js b/src/embind/embind.js
index c7b1633a..ccce9f19 100755
--- a/src/embind/embind.js
+++ b/src/embind/embind.js
@@ -221,10 +221,14 @@ function __embind_register_bool(rawType, name, trueValue, falseValue) {
     });
 }
 
-function __embind_register_integer(rawType, name) {
+// When converting a number from JS to C++ side, the valid range of the number is
+// [minRange, maxRange], inclusive.
+function __embind_register_integer(primitiveType, name, minRange, maxRange) {
     name = Pointer_stringify(name);
     registerType(rawType, {
         name: name,
+        minRange: minRange,
+        maxRange: maxRange,
         fromWireType: function(value) {
             return value;
         },
@@ -232,6 +236,9 @@ function __embind_register_integer(rawType, name) {
             if (typeof value !== "number") {
                 throw new TypeError('Cannot convert "' + _embind_repr(value) + '" to ' + this.name);
             }
+            if (value < minRange || value > maxRange) {
+                throw new TypeError('Passing a number "' + _embind_repr(value) + '" from JS side to C/C++ side to an argument of type "' + name + '", which is outside the valid range [' + minRange + ', ' + maxRange + ']!');
+            }
             return value | 0;
         },
     });
diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h
index 332c533b..b30cf54b 100755
--- a/system/include/emscripten/bind.h
+++ b/system/include/emscripten/bind.h
@@ -39,7 +39,9 @@ namespace emscripten {
 
             void _embind_register_integer(
                 TYPEID integerType,
-                const char* name);
+                const char* name,
+                int minRange,
+                int maxRange);
 
             void _embind_register_float(
                 TYPEID floatType,
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");