StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

registry: remove a few asprintf/free() calls with snprintf 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
master
Peter Hutterer 2021-03-19 09:49:24 +10:00
parent a50890b155
commit 8b7c1850e1
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/registry.c
View File

@ -594,7 +594,7 @@ XKB_EXPORT bool
rxkb_context_include_path_append_default(struct rxkb_context *ctx) rxkb_context_include_path_append_default(struct rxkb_context *ctx)
{ {
const char *home, *xdg, *root, *extra; const char *home, *xdg, *root, *extra;
char *user_path; char user_path[PATH_MAX];
bool ret = false; bool ret = false;
if (ctx->context_state != CONTEXT_NEW) { if (ctx->context_state != CONTEXT_NEW) {
@ -606,26 +606,17 @@ rxkb_context_include_path_append_default(struct rxkb_context *ctx)
xdg = rxkb_context_getenv(ctx, "XDG_CONFIG_HOME"); xdg = rxkb_context_getenv(ctx, "XDG_CONFIG_HOME");
if (xdg != NULL) { if (xdg != NULL) {
user_path = asprintf_safe("%s/xkb", xdg); if (snprintf_safe(user_path, sizeof(user_path), "%s/xkb", xdg))
if (user_path) {
ret |= rxkb_context_include_path_append(ctx, user_path); ret |= rxkb_context_include_path_append(ctx, user_path);
free(user_path);
}
} else if (home != NULL) { } else if (home != NULL) {
/* XDG_CONFIG_HOME fallback is $HOME/.config/ */ /* XDG_CONFIG_HOME fallback is $HOME/.config/ */
user_path = asprintf_safe("%s/.config/xkb", home); if (snprintf_safe(user_path, sizeof(user_path), "%s/.config/xkb", home))
if (user_path) {
ret |= rxkb_context_include_path_append(ctx, user_path); ret |= rxkb_context_include_path_append(ctx, user_path);
free(user_path);
}
} }
if (home != NULL) { if (home != NULL) {
user_path = asprintf_safe("%s/.xkb", home); if (snprintf_safe(user_path, sizeof(user_path), "%s/.xkb", home))
if (user_path) {
ret |= rxkb_context_include_path_append(ctx, user_path); ret |= rxkb_context_include_path_append(ctx, user_path);
free(user_path);
}
} }
extra = rxkb_context_getenv(ctx, "XKB_CONFIG_EXTRA_PATH"); extra = rxkb_context_getenv(ctx, "XKB_CONFIG_EXTRA_PATH");