Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

JS: Fix weird string corruptions and usages

Browse Source
This commit is contained in:
Willy-JL
2024-03-17 20:48:00 +00:00
parent 6b21783d76
commit c2deba8e2c
4 changed files with 58 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
applications/system/js_app/modules/js_blebeacon.c
View File

@@ -43,16 +43,6 @@ static bool check_arg_count(struct mjs* mjs, size_t count) {
return true;
}
static bool get_int_arg(struct mjs* mjs, size_t index, uint8_t* value, bool error) {
mjs_val_t int_obj = mjs_arg(mjs, index);
if(!mjs_is_number(int_obj)) {
if(error) ret_bad_args(mjs, "Argument must be a number");
return false;
}
*value = mjs_get_int(mjs, int_obj);
return true;
}
static void js_blebeacon_is_active(struct mjs* mjs) {
JsBlebeaconInst* blebeacon = get_this_ctx(mjs);
if(!check_arg_count(mjs, 0)) return;
@@ -83,15 +73,24 @@ static void js_blebeacon_set_config(struct mjs* mjs) {
}
uint8_t power = GapAdvPowerLevel_0dBm;
get_int_arg(mjs, 1, &power, false);
mjs_val_t power_arg = mjs_arg(mjs, 1);
if(mjs_is_number(power_arg)) {
power = mjs_get_int32(mjs, power_arg);
}
power = CLAMP(power, GapAdvPowerLevel_6dBm, GapAdvPowerLevel_Neg40dBm);
uint8_t intv_min = 50;
get_int_arg(mjs, 2, &intv_min, false);
mjs_val_t intv_min_arg = mjs_arg(mjs, 2);
if(mjs_is_number(intv_min_arg)) {
intv_min = mjs_get_int32(mjs, intv_min_arg);
}
intv_min = MAX(intv_min, 20);
uint8_t intv_max = 150;
get_int_arg(mjs, 3, &intv_max, false);
mjs_val_t intv_max_arg = mjs_arg(mjs, 3);
if(mjs_is_number(intv_max_arg)) {
intv_max = mjs_get_int32(mjs, intv_max_arg);
}
intv_max = MAX(intv_max, intv_min);
GapExtraBeaconConfig config = {

54
applications/system/js_app/modules/js_keyboard.c
View File

@@ -22,31 +22,6 @@ static void ret_bad_args(struct mjs* mjs, const char* error) {
mjs_return(mjs, MJS_UNDEFINED);
}
static bool get_str_arg(struct mjs* mjs, size_t index, const char** value, bool error) {
mjs_val_t str_obj = mjs_arg(mjs, index);
if(!mjs_is_string(str_obj)) {
if(error) ret_bad_args(mjs, "Argument must be a string");
return false;
}
size_t str_len = 0;
*value = mjs_get_string(mjs, &str_obj, &str_len);
if((str_len == 0) || (*value == NULL)) {
if(error) ret_bad_args(mjs, "Bad string argument");
return false;
}
return true;
}
static bool get_int_arg(struct mjs* mjs, size_t index, size_t* value, bool error) {
mjs_val_t int_obj = mjs_arg(mjs, index);
if(!mjs_is_number(int_obj)) {
if(error) ret_bad_args(mjs, "Argument must be a number");
return false;
}
*value = mjs_get_int(mjs, int_obj);
return true;
}
static JsKeyboardInst* get_this_ctx(struct mjs* mjs) {
mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
JsKeyboardInst* storage = mjs_get_ptr(mjs, obj_inst);
@@ -70,8 +45,12 @@ static bool keyboard_exit(void* context) {
static void js_keyboard_set_header(struct mjs* mjs) {
JsKeyboardInst* keyboard = get_this_ctx(mjs);
const char* header;
if(!get_str_arg(mjs, 0, &header, true)) return;
mjs_val_t header_arg = mjs_arg(mjs, 0);
const char* header = mjs_get_string(mjs, &header_arg, NULL);
if(!header) {
ret_bad_args(mjs, "Header must be a string");
return;
}
text_input_set_header_text(keyboard->text_input, header);
byte_input_set_header_text(keyboard->byte_input, header);
@@ -82,13 +61,18 @@ static void js_keyboard_set_header(struct mjs* mjs) {
static void js_keyboard_text(struct mjs* mjs) {
JsKeyboardInst* keyboard = get_this_ctx(mjs);
size_t input_length;
if(!get_int_arg(mjs, 0, &input_length, true)) return;
mjs_val_t input_length_arg = mjs_arg(mjs, 0);
if(!mjs_is_number(input_length_arg)) {
ret_bad_args(mjs, "Input length must be a number");
return;
}
int32_t input_length = mjs_get_int32(mjs, input_length_arg);
char* buffer = malloc(input_length);
const char* default_text = "";
mjs_val_t default_text_arg = mjs_arg(mjs, 1);
const char* default_text = mjs_get_string(mjs, &default_text_arg, NULL);
bool clear_default = false;
if(get_str_arg(mjs, 1, &default_text, false)) {
if(default_text) {
strlcpy(buffer, default_text, input_length);
mjs_val_t bool_obj = mjs_arg(mjs, 2);
clear_default = mjs_get_bool(mjs, bool_obj);
@@ -120,8 +104,12 @@ static void js_keyboard_text(struct mjs* mjs) {
static void js_keyboard_byte(struct mjs* mjs) {
JsKeyboardInst* keyboard = get_this_ctx(mjs);
size_t input_length;
if(!get_int_arg(mjs, 0, &input_length, true)) return;
mjs_val_t input_length_arg = mjs_arg(mjs, 0);
if(!mjs_is_number(input_length_arg)) {
ret_bad_args(mjs, "Input length must be a number");
return;
}
int32_t input_length = mjs_get_int32(mjs, input_length_arg);
uint8_t* buffer = malloc(input_length);
mjs_val_t default_data_arg = mjs_arg(mjs, 1);

20
applications/system/js_app/modules/js_subghz/js_subghz.c
View File

@@ -41,17 +41,6 @@ static FuriHalSubGhzPreset js_subghz_get_preset_name(const char* preset_name) {
return preset;
}
static int32_t get_int_arg(struct mjs* mjs, size_t index, int32_t* value) {
mjs_val_t int_obj = mjs_arg(mjs, index);
if(!mjs_is_number(int_obj)) {
mjs_prepend_errorf(mjs, MJS_BAD_ARGS_ERROR, "Argument must be a number");
mjs_return(mjs, MJS_UNDEFINED);
return false;
}
*value = mjs_get_int(mjs, int_obj);
return true;
}
static void js_subghz_set_rx(struct mjs* mjs) {
mjs_val_t obj_inst = mjs_get(mjs, mjs_get_this(mjs), INST_PROP_NAME, ~0);
JsSubghzInst* js_subghz = mjs_get_ptr(mjs, obj_inst);
@@ -137,8 +126,13 @@ static void js_subghz_set_frequency(struct mjs* mjs) {
return;
}
int32_t frequency;
if(!get_int_arg(mjs, 0, &frequency)) return;
mjs_val_t frequency_arg = mjs_arg(mjs, 0);
if(!mjs_is_number(frequency_arg)) {
mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Frequency must be a number");
mjs_return(mjs, MJS_UNDEFINED);
return;
}
int32_t frequency = mjs_get_int32(mjs, frequency_arg);
if(!subghz_devices_is_frequency_valid(js_subghz->radio_device, frequency)) {
mjs_prepend_errorf(mjs, MJS_INTERNAL_ERROR, "Invalid frequency");

49
applications/system/js_app/modules/js_submenu.c
View File

@@ -34,31 +34,6 @@ static bool check_arg_count(struct mjs* mjs, size_t count) {
return true;
}
static bool get_str_arg(struct mjs* mjs, size_t index, const char** value) {
mjs_val_t str_obj = mjs_arg(mjs, index);
if(!mjs_is_string(str_obj)) {
ret_bad_args(mjs, "Argument must be a string");
return false;
}
size_t str_len = 0;
*value = mjs_get_string(mjs, &str_obj, &str_len);
if((str_len == 0) || (*value == NULL)) {
ret_bad_args(mjs, "Bad string argument");
return false;
}
return true;
}
static int32_t get_int_arg(struct mjs* mjs, size_t index, int32_t* value) {
mjs_val_t int_obj = mjs_arg(mjs, index);
if(!mjs_is_number(int_obj)) {
ret_bad_args(mjs, "Argument must be a number");
return false;
}
*value = mjs_get_int32(mjs, int_obj);
return true;
}
static void submenu_callback(void* context, uint32_t id) {
UNUSED(id);
JsSubmenuInst* submenu = context;
@@ -70,11 +45,19 @@ static void js_submenu_add_item(struct mjs* mjs) {
JsSubmenuInst* submenu = get_this_ctx(mjs);
if(!check_arg_count(mjs, 2)) return;
const char* label;
if(!get_str_arg(mjs, 0, &label)) return;
mjs_val_t label_arg = mjs_arg(mjs, 0);
const char* label = mjs_get_string(mjs, &label_arg, NULL);
if(!label) {
ret_bad_args(mjs, "Label must be a string");
return;
}
int32_t id;
if(!get_int_arg(mjs, 1, &id)) return;
mjs_val_t id_arg = mjs_arg(mjs, 1);
if(!mjs_is_number(id_arg)) {
ret_bad_args(mjs, "Id must be a number");
return;
}
int32_t id = mjs_get_int32(mjs, id_arg);
submenu_add_item(submenu->submenu, label, id, submenu_callback, submenu);
@@ -85,8 +68,12 @@ static void js_submenu_set_header(struct mjs* mjs) {
JsSubmenuInst* submenu = get_this_ctx(mjs);
if(!check_arg_count(mjs, 1)) return;
const char* header;
if(!get_str_arg(mjs, 0, &header)) return;
mjs_val_t header_arg = mjs_arg(mjs, 0);
const char* header = mjs_get_string(mjs, &header_arg, NULL);
if(!header) {
ret_bad_args(mjs, "Header must be a string");
return;
}
submenu_set_header(submenu->submenu, header);