Merge remote-tracking branch 'ofw/dev' into mntm-dev

lib/mjs/mjs_core.c

@@ -103,6 +103,7 @@ struct mjs* mjs_create(void* context) {
         sizeof(struct mjs_object),
         MJS_OBJECT_ARENA_SIZE,
         MJS_OBJECT_ARENA_INC_SIZE);
+    mjs->object_arena.destructor = mjs_obj_destructor;
     gc_arena_init(
         &mjs->property_arena,
         sizeof(struct mjs_property),

lib/mjs/mjs_object.c

@@ -9,6 +9,7 @@
 #include "mjs_primitive.h"
 #include "mjs_string.h"
 #include "mjs_util.h"
+#include "furi.h"
 
 #include "common/mg_str.h"
 
@@ -20,6 +21,19 @@ MJS_PRIVATE mjs_val_t mjs_object_to_value(struct mjs_object* o) {
     }
 }
 
+MJS_PRIVATE void mjs_obj_destructor(struct mjs* mjs, void* cell) {
+    struct mjs_object* obj = cell;
+    mjs_val_t obj_val = mjs_object_to_value(obj);
+
+    struct mjs_property* destructor = mjs_get_own_property(
+        mjs, obj_val, MJS_DESTRUCTOR_PROP_NAME, strlen(MJS_DESTRUCTOR_PROP_NAME));
+    if(!destructor) return;
+    if(!mjs_is_foreign(destructor->value)) return;
+
+    mjs_custom_obj_destructor_t destructor_fn = mjs_get_ptr(mjs, destructor->value);
+    if(destructor_fn) destructor_fn(mjs, obj_val);
+}
+
 MJS_PRIVATE struct mjs_object* get_object_struct(mjs_val_t v) {
     struct mjs_object* ret = NULL;
     if(mjs_is_null(v)) {
@@ -293,7 +307,8 @@ mjs_val_t
    * start from the end so the constructed object more closely resembles
    * the definition.
    */
-    while(def->name != NULL) def++;
+    while(def->name != NULL)
+        def++;
     for(def--; def >= defs; def--) {
         mjs_val_t v = MJS_UNDEFINED;
         const char* ptr = (const char*)base + def->offset;

lib/mjs/mjs_object.h

@@ -50,6 +50,11 @@ MJS_PRIVATE mjs_err_t mjs_set_internal(
  */
 MJS_PRIVATE void mjs_op_create_object(struct mjs* mjs);
 
+/*
+ * Cell destructor for object arena
+ */
+MJS_PRIVATE void mjs_obj_destructor(struct mjs* mjs, void* cell);
+
 #define MJS_PROTO_PROP_NAME "__p" /* Make it < 5 chars */
 
 #if defined(__cplusplus)

lib/mjs/mjs_object_public.h

@@ -119,6 +119,14 @@ int mjs_del(struct mjs* mjs, mjs_val_t obj, const char* name, size_t len);
  */
 mjs_val_t mjs_next(struct mjs* mjs, mjs_val_t obj, mjs_val_t* iterator);
 
+typedef void (*mjs_custom_obj_destructor_t)(struct mjs* mjs, mjs_val_t object);
+
+/*
+ * Destructor property name. If set, must be a foreign pointer to a function
+ * that will be called just before the object is freed.
+ */
+#define MJS_DESTRUCTOR_PROP_NAME "__d"
+
 #if defined(__cplusplus)
 }
 #endif /* __cplusplus */

lib/nfc/helpers/iso14443_4_layer.c

@@ -33,7 +33,7 @@
 #define ISO14443_4_BLOCK_PCB_S_CID_MASK            (1U << ISO14443_4_BLOCK_PCB_R_CID_OFFSET)
 #define ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_MASK   (3U << ISO14443_4_BLOCK_PCB_S_WTX_DESELECT_OFFSET)
 
-#define ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, mask) (((pcb) & mask) == mask)
+#define ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, mask) (((pcb) & (mask)) == (mask))
 
 #define ISO14443_4_BLOCK_PCB_IS_R_BLOCK(pcb) \
     ISO14443_4_BLOCK_PCB_BITS_ACTIVE(pcb, ISO14443_4_BLOCK_PCB_R_MASK)
@@ -121,13 +121,6 @@ bool iso14443_4_layer_decode_block(
 
     bool ret = false;
 
-    // TODO: Fix properly! this is a very big kostyl na velosipede
-    // (bit_buffer_copy_right are called to copy bigger buffer into smaller buffer causing crash on furi check) issue comes iso14443_4a_poller_send_block at line 109
-    // Mimicks furi_check()s in bit_buffer_copy_right(): buf=output_data other=block_data start_index=1
-    if(!(bit_buffer_get_size_bytes(block_data) > 1)) return ret;
-    if(!(bit_buffer_get_capacity_bytes(output_data) >= bit_buffer_get_size_bytes(block_data) - 1))
-        return ret;
-
     do {
         if(ISO14443_4_BLOCK_PCB_IS_R_BLOCK(instance->pcb_prev)) {
             const uint8_t response_pcb = iso14443_4_layer_get_response_pcb(block_data);

lib/nfc/protocols/iso14443_4a/iso14443_4a_listener.c

@@ -65,10 +65,8 @@ static NfcCommand iso14443_4a_listener_run(NfcGenericEvent event, void* context)
         if(instance->state == Iso14443_4aListenerStateIdle) {
             if(bit_buffer_get_size_bytes(rx_buffer) == 2 &&
                bit_buffer_get_byte(rx_buffer, 0) == ISO14443_4A_CMD_READ_ATS) {
-                if(iso14443_4a_listener_send_ats(instance, &instance->data->ats_data) !=
+                if(iso14443_4a_listener_send_ats(instance, &instance->data->ats_data) ==
                    Iso14443_4aErrorNone) {
-                    command = NfcCommandContinue;
-                } else {
                     instance->state = Iso14443_4aListenerStateActive;
                 }
             }
@@ -93,7 +91,6 @@ static NfcCommand iso14443_4a_listener_run(NfcGenericEvent event, void* context)
         if(instance->callback) {
             command = instance->callback(instance->generic_event, instance->context);
         }
-        command = NfcCommandContinue;
     }
 
     return command;