Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 16:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix relative path checking in get_exe_path, plus a signed comparison

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-10-28 13:25:25 -07:00 • committed by Tomer Lev
parent d3baa0d1f7
commit 5494e4e6fd
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/util.cc
View file

@ -778,7 +778,7 @@ std::string get_exe_path(const std::string& invocation)
// Absolute path // Absolute path
return invocation; return invocation;
if ( invocation_path.is_relative() ) if ( invocation_path.is_relative() && invocation_path.has_parent_path() )
{ {
// Relative path // Relative path
char cwd[PATH_MAX]; char cwd[PATH_MAX];
@ -1620,7 +1620,7 @@ const char* fmt_bytes(const char* data, int len)
const char* vfmt(const char* format, va_list al) const char* vfmt(const char* format, va_list al)
{ {
static char* buf = nullptr; static char* buf = nullptr;
static unsigned int buf_len = 1024; static int buf_len = 1024;
if ( ! buf ) if ( ! buf )
buf = (char*)safe_malloc(buf_len); buf = (char*)safe_malloc(buf_len);