github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

Add a missing CheckReadAccess() 

Also make CheckReadAccess() easier to use without need for a temp.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
pull/47/head
Selva Nair 2016-05-13 23:34:53 -04:00
parent fb97c3f4f1
commit 38541f3693
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openvpn_config.c
View File

@ -62,10 +62,13 @@ match(const WIN32_FIND_DATA *find, const TCHAR *ext)
} }
static bool static bool
CheckReadAccess (const TCHAR *path) CheckReadAccess (const TCHAR *dir, const TCHAR *file)
{ {
HANDLE h; HANDLE h;
bool ret = FALSE; bool ret = FALSE;
TCHAR path[MAX_PATH];
_sntprintf_0 (path, _T("%s\\%s"), dir, file);
h = CreateFile (path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, h = CreateFile (path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, NULL); FILE_ATTRIBUTE_NORMAL, NULL);
@ -127,7 +130,6 @@ BuildFileList0(const TCHAR *config_dir, bool warn_duplicates)
HANDLE find_handle; HANDLE find_handle;
TCHAR find_string[MAX_PATH]; TCHAR find_string[MAX_PATH];
TCHAR subdir_table[MAX_CONFIG_SUBDIRS][MAX_PATH]; TCHAR subdir_table[MAX_CONFIG_SUBDIRS][MAX_PATH];
TCHAR fullpath[MAX_PATH];
int subdirs = 0; int subdirs = 0;
int i; int i;
@ -148,8 +150,6 @@ BuildFileList0(const TCHAR *config_dir, bool warn_duplicates)
match_t match_type = match(&find_obj, o.ext_string); match_t match_type = match(&find_obj, o.ext_string);
if (match_type == match_file) if (match_type == match_file)
{ {
_sntprintf_0(fullpath, _T("%s\\%s"), config_dir, find_obj.cFileName);
if (ConfigAlreadyExists(find_obj.cFileName)) if (ConfigAlreadyExists(find_obj.cFileName))
{ {
if (warn_duplicates) if (warn_duplicates)
@ -157,7 +157,7 @@ BuildFileList0(const TCHAR *config_dir, bool warn_duplicates)
continue; continue;
} }
if (CheckReadAccess (fullpath)) if (CheckReadAccess (config_dir, find_obj.cFileName))
AddConfigFileToList(o.num_configs++, find_obj.cFileName, config_dir); AddConfigFileToList(o.num_configs++, find_obj.cFileName, config_dir);
} }
else if (match_type == match_dir) else if (match_type == match_dir)
@ -204,7 +204,8 @@ BuildFileList0(const TCHAR *config_dir, bool warn_duplicates)
continue; continue;
} }
AddConfigFileToList(o.num_configs++, find_obj.cFileName, subdir_table[i]); if (CheckReadAccess (subdir_table[i], find_obj.cFileName))
AddConfigFileToList(o.num_configs++, find_obj.cFileName, subdir_table[i]);
} while (FindNextFile(find_handle, &find_obj)); } while (FindNextFile(find_handle, &find_obj));
FindClose(find_handle); FindClose(find_handle);