osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

wsutil: Only copy configuration files that are regular files 

If someone manually puts a directory, or a FIFO, or something
else (block device?) in a configuration directory with the same
name as a preference file, don't try to copy it and just silently
ignore it.
This commit is contained in:
John Thacker 2024-02-20 09:50:58 -05:00
parent 8bdc10c6ca
commit 70157523b7
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wsutil/filesystem.c
View File

@ -221,6 +221,21 @@ test_for_fifo(const char *path)
return 0;
}
bool
test_for_regular_file(const char *path)
{
ws_statb64 statb;
if (!path) {
return false;
}
if (ws_stat64(path, &statb) != 0)
return false;
return S_ISREG(statb.st_mode);
}
#ifdef ENABLE_APPLICATION_BUNDLE
/*
* Directory of the application bundle in which we're contained,
@ -2020,7 +2035,7 @@ copy_persconffile_profile(const char *toname, const char *fromname, bool from_gl
from_file = ws_strdup_printf ("%s%s%s", from_dir, G_DIR_SEPARATOR_S, filename);
to_file = ws_strdup_printf ("%s%s%s", to_dir, G_DIR_SEPARATOR_S, filename);
if (file_exists(from_file) && !copy_file_binary_mode(from_file, to_file)) {
if (test_for_regular_file(from_file) && !copy_file_binary_mode(from_file, to_file)) {
*pf_filename_return = g_strdup(filename);
g_free (from_file);
g_free (to_file);

9
wsutil/filesystem.h
View File

@ -349,7 +349,14 @@ WS_DLL_PUBLIC int test_for_directory(const char *);
WS_DLL_PUBLIC int test_for_fifo(const char *);
/*
* Check, if file is existing.
* Given a pathname, return true if the attempt to "stat()" the file
* succeeds, and it turns out to be a regular file. "stat()" follows
* links, so returns true if the pathname is a link to a regular file.
*/
WS_DLL_PUBLIC bool test_for_regular_file(const char *);
/*
* Check if a file exists.
*/
WS_DLL_PUBLIC bool file_exists(const char *fname);