mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-11-23 06:59:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt: avoid crash when Incorrect Settings for keyboard layout

Browse source
This commit is contained in:
DreamMaoMao 2025-11-01 14:29:53 +08:00
parent e658274b71
commit 3ebb9a1508
2 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/dispatch/bind_define.h
View file

@ -862,8 +862,9 @@ int switch_keyboard_layout(const Arg *arg) {
}
}
// 4. 直接修改 rules.layout（保持原有逻辑）
// 4. 安全地处理 rules.layout
struct xkb_rule_names rules = xkb_rules;
// 验证规则是否有效
if (!check_keyboard_rules_validate(&rules)) {
wlr_log(WLR_ERROR,
@ -871,15 +872,27 @@ int switch_keyboard_layout(const Arg *arg) {
rules = xkb_default_rules;
}
char *layout_buf = (char *)rules.layout; // 假设这是可修改的
// 安全地处理 layout 字符串
const char *current_layout = rules.layout;
if (!current_layout || strlen(current_layout) == 0) {
wlr_log(WLR_INFO, "Using default layout 'us'");
current_layout = "us";
}
// 清空原有内容（安全方式）
unsigned int layout_buf_size = strlen(layout_buf) + 1;
memset(layout_buf, 0, layout_buf_size);
// 创建足够大的缓冲区来构建新的布局字符串
unsigned int layout_buf_size =
1024; // 使用固定大小，避免依赖可能为NULL的字符串
char *layout_buf = calloc(layout_buf_size, sizeof(char));
if (!layout_buf) {
wlr_log(WLR_ERROR, "Failed to allocate layout buffer");
goto cleanup_layouts;
}
// 构建新的布局字符串
for (int i = 0; i < num_layouts; i++) {
const char *layout = layout_ids[(next + i) % num_layouts];
if (!layout)
continue;
if (i > 0) {
strncat(layout_buf, ",", layout_buf_size - strlen(layout_buf) - 1);
@ -900,13 +913,16 @@ int switch_keyboard_layout(const Arg *arg) {
}
}
// 更新 rules 结构体
rules.layout = layout_buf;
// 5. 创建新 keymap
struct xkb_keymap *new_keymap =
xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!new_keymap) {
wlr_log(WLR_ERROR, "Failed to create keymap for layouts: %s",
rules.layout);
goto cleanup_layouts;
goto cleanup_layout_buf;
}
// 6. 应用新 keymap
@ -925,6 +941,9 @@ int switch_keyboard_layout(const Arg *arg) {
// 8. 清理资源
xkb_keymap_unref(new_keymap);
cleanup_layout_buf:
free(layout_buf);
cleanup_layouts:
free(layout_ids);

3
src/mango.c
View file

@ -4484,6 +4484,9 @@ bool check_keyboard_rules_validate(struct xkb_rule_names *rules) {
return false;
}
if (!rules->layout || strlen(rules->layout) == 0)
return false;
struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
if (!context) {
wlr_log(WLR_ERROR, "Failed to create XKB context for validation");