Add a more secure type validator to BleHciSocket based on #911 (#978)

Related issue: #816

IoT.js-DCO-1.0-Signed-off-by: László Langó [email protected]

Author: LaszloLango

src/modules/iotjs_module_blehcisocket.c

@@ -45,16 +45,15 @@
 #define THIS iotjs_blehcisocket_t* blehcisocket
 
 
-static void iotjs_blehcisocket_destroy(THIS);
-IOTJS_DEFINE_NATIVE_HANDLE_INFO(blehcisocket);
+IOTJS_DEFINE_NATIVE_HANDLE_INFO_THIS_MODULE(blehcisocket);
 
 
 iotjs_blehcisocket_t* iotjs_blehcisocket_create(const iotjs_jval_t* jble) {
   THIS = IOTJS_ALLOC(iotjs_blehcisocket_t);
   IOTJS_VALIDATED_STRUCT_CONSTRUCTOR(iotjs_blehcisocket_t, blehcisocket);
 
   iotjs_jobjectwrap_initialize(&_this->jobjectwrap, jble,
-                               &blehcisocket_native_info);
+                               &this_module_native_info);
 
   iotjs_blehcisocket_initialize(blehcisocket);
 
@@ -79,29 +78,19 @@ static void iotjs_blehcisocket_destroy(THIS) {
 
 
 JHANDLER_FUNCTION(Start) {
-  DJHANDLER_CHECK_THIS(object);
+  JHANDLER_DECLARE_THIS_PTR(blehcisocket, blehcisocket);
   DJHANDLER_CHECK_ARGS(0);
 
-  const iotjs_jval_t* jblehcisocket = JHANDLER_GET_THIS(object);
-
-  iotjs_blehcisocket_t* blehcisocket =
-      iotjs_blehcisocket_instance_from_jval(jblehcisocket);
-
   iotjs_blehcisocket_start(blehcisocket);
 
   iotjs_jhandler_return_undefined(jhandler);
 }
 
 
 JHANDLER_FUNCTION(BindRaw) {
-  DJHANDLER_CHECK_THIS(object);
+  JHANDLER_DECLARE_THIS_PTR(blehcisocket, blehcisocket);
   JHANDLER_CHECK(ge(iotjs_jhandler_get_arg_length(jhandler), 1));
 
-  const iotjs_jval_t* jblehcisocket = JHANDLER_GET_THIS(object);
-
-  iotjs_blehcisocket_t* blehcisocket =
-      iotjs_blehcisocket_instance_from_jval(jblehcisocket);
-
   int devId = 0;
   int* pDevId = NULL;
 
@@ -118,14 +107,9 @@ JHANDLER_FUNCTION(BindRaw) {
 
 
 JHANDLER_FUNCTION(BindUser) {
-  DJHANDLER_CHECK_THIS(object);
+  JHANDLER_DECLARE_THIS_PTR(blehcisocket, blehcisocket);
   DJHANDLER_CHECK_ARGS(1, number);
 
-  const iotjs_jval_t* jblehcisocket = JHANDLER_GET_THIS(object);
-
-  iotjs_blehcisocket_t* blehcisocket =
-      iotjs_blehcisocket_instance_from_jval(jblehcisocket);
-
   int devId = JHANDLER_GET_ARG(0, number);
   int* pDevId = &devId;
 
@@ -136,42 +120,29 @@ JHANDLER_FUNCTION(BindUser) {
 
 
 JHANDLER_FUNCTION(BindControl) {
-  DJHANDLER_CHECK_THIS(object);
+  JHANDLER_DECLARE_THIS_PTR(blehcisocket, blehcisocket);
   DJHANDLER_CHECK_ARGS(0);
 
-  const iotjs_jval_t* jblehcisocket = JHANDLER_GET_THIS(object);
-
-  iotjs_blehcisocket_t* blehcisocket =
-      iotjs_blehcisocket_instance_from_jval(jblehcisocket);
-
   iotjs_blehcisocket_bindControl(blehcisocket);
 
   iotjs_jhandler_return_undefined(jhandler);
 }
 
 
 JHANDLER_FUNCTION(IsDevUp) {
-  DJHANDLER_CHECK_THIS(object);
+  JHANDLER_DECLARE_THIS_PTR(blehcisocket, blehcisocket);
   DJHANDLER_CHECK_ARGS(0);
 
-  const iotjs_jval_t* jblehcisocket = JHANDLER_GET_THIS(object);
-
-  iotjs_blehcisocket_t* blehcisocket =
-      iotjs_blehcisocket_instance_from_jval(jblehcisocket);
-
   bool ret = iotjs_blehcisocket_isDevUp(blehcisocket);
 
   iotjs_jhandler_return_boolean(jhandler, ret);
 }
 
 
 JHANDLER_FUNCTION(SetFilter) {
-  DJHANDLER_CHECK_THIS(object);
+  JHANDLER_DECLARE_THIS_PTR(blehcisocket, blehcisocket);
   DJHANDLER_CHECK_ARGS(1, object);
 
-  const iotjs_jval_t* jblehcisocket = JHANDLER_GET_THIS(object);
-  iotjs_blehcisocket_t* blehcisocket =
-      iotjs_blehcisocket_instance_from_jval(jblehcisocket);
   iotjs_bufferwrap_t* buffer =
       iotjs_bufferwrap_from_jbuffer(JHANDLER_GET_ARG(0, object));
 
@@ -183,27 +154,19 @@ JHANDLER_FUNCTION(SetFilter) {
 
 
 JHANDLER_FUNCTION(Stop) {
-  DJHANDLER_CHECK_THIS(object);
+  JHANDLER_DECLARE_THIS_PTR(blehcisocket, blehcisocket);
   DJHANDLER_CHECK_ARGS(0);
 
-  const iotjs_jval_t* jblehcisocket = JHANDLER_GET_THIS(object);
-
-  iotjs_blehcisocket_t* blehcisocket =
-      iotjs_blehcisocket_instance_from_jval(jblehcisocket);
-
   iotjs_blehcisocket_stop(blehcisocket);
 
   iotjs_jhandler_return_undefined(jhandler);
 }
 
 
 JHANDLER_FUNCTION(Write) {
-  DJHANDLER_CHECK_THIS(object);
+  JHANDLER_DECLARE_THIS_PTR(blehcisocket, blehcisocket);
   DJHANDLER_CHECK_ARGS(1, object);
 
-  const iotjs_jval_t* jblehcisocket = JHANDLER_GET_THIS(object);
-  iotjs_blehcisocket_t* blehcisocket =
-      iotjs_blehcisocket_instance_from_jval(jblehcisocket);
   iotjs_bufferwrap_t* buffer =
       iotjs_bufferwrap_from_jbuffer(JHANDLER_GET_ARG(0, object));