Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-25 03:29:58 -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

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);