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

registry: simplify strdup() error handling 

strdup() is the least likely call to fail here, let's move it to the bottom so
we don't need to worry about the allocated string.

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

20
src/registry.c
View File

@ -564,18 +564,14 @@ rxkb_context_include_path_append(struct rxkb_context *ctx, const char *path)
return false; return false;
} }
tmp = strdup(path);
if (!tmp)
goto err;
err = stat(path, &stat_buf); err = stat(path, &stat_buf);
if (err != 0) if (err != 0)
goto err; return false;
if (!S_ISDIR(stat_buf.st_mode)) if (!S_ISDIR(stat_buf.st_mode))
goto err; return false;
if (!check_eaccess(path, R_OK | X_OK)) if (!check_eaccess(path, R_OK | X_OK))
goto err; return false;
/* Pre-filter for the 99.9% case - if we can't assemble the default ruleset /* Pre-filter for the 99.9% case - if we can't assemble the default ruleset
* path, complain here instead of during parsing later. The niche cases * path, complain here instead of during parsing later. The niche cases
@ -583,15 +579,15 @@ rxkb_context_include_path_append(struct rxkb_context *ctx, const char *path)
*/ */
if (!snprintf_safe(rules, sizeof(rules), "%s/rules/%s.xml", if (!snprintf_safe(rules, sizeof(rules), "%s/rules/%s.xml",
path, DEFAULT_XKB_RULES)) path, DEFAULT_XKB_RULES))
goto err; return false;
tmp = strdup(path);
if (!tmp)
return false;
darray_append(ctx->includes, tmp); darray_append(ctx->includes, tmp);
return true; return true;
err:
free(tmp);
return false;
} }
XKB_EXPORT bool XKB_EXPORT bool