AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2025-02-21 17:25:30 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

util: when using basename() for creating temporary files, verify the resulting name is actually valid

Browse Source 
Also, rename filename_is_safe() to filename_is_valid(), since it
actually does a full validation for what the kernel will accept as file
name, it's not just a heuristic.

NOTE: eudev doesn't have filename_is_safe() -- AGB

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
This commit is contained in:
Lennart Poettering 2014-12-20 08:50:52 -05:00 committed by Anthony G. Basile
parent 6b16cd5fed
commit c26b217d91
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/shared/util.c
View File

@ -385,7 +385,7 @@ const char* split(const char **state, size_t *l, const char *separator, bool quo
*l = strcspn_escaped(current + 1, quotechars);
if (current[*l + 1] == '\0' ||
(current[*l + 2] && !strchr(separator, current[*l + 2]))) {
/* right quote missing or garbage at the end*/
/* right quote missing or garbage at the end */
*state = current;
return NULL;
}
@ -1044,15 +1044,15 @@ int fd_wait_for_event(int fd, int event, usec_t t) {
int fopen_temporary(const char *path, FILE **_f, char **_temp_path) {
FILE *f;
char *t;
int fd;
int r, fd;
assert(path);
assert(_f);
assert(_temp_path);
t = tempfn_xxxxxx(path);
if (!t)
return -ENOMEM;
r = tempfn_xxxxxx(path, &t);
if (r < 0)
return r;
#if HAVE_DECL_MKOSTEMP
fd = mkostemp_safe(t, O_WRONLY|O_CLOEXEC);
@ -1577,7 +1577,8 @@ char *tempfn_xxxxxx(const char *p) {
strcpy(stpcpy(stpcpy(mempcpy(t, p, k), "."), fn), "XXXXXX");
return t;
*ret = t;
return 0;
}
int is_dir(const char* path, bool follow) {

2
src/shared/util.h
View File

@ -453,7 +453,7 @@ union file_handle_union {
char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ];
};
char *tempfn_xxxxxx(const char *p);
int tempfn_xxxxxx(const char *p, char **ret);
int is_dir(const char *path, bool follow);