From d7dd11b8f37c9a25adb43edf9ddc0c3322e5f15c Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 19 May 2014 16:56:31 +0000 Subject: [PATCH] * pseudo-reloc.cc (__report_error): Raise size of module name buffer to PATH_MAX. Fix length in call to GetModuleFileNameW (CID 59947). --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/pseudo-reloc.cc | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 2a5724e46..3ff4f896c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2014-05-19 Corinna Vinschen + + * pseudo-reloc.cc (__report_error): Raise size of module name buffer to + PATH_MAX. Fix length in call to GetModuleFileNameW (CID 59947). + 2014-05-19 Corinna Vinschen * net.cc (call_gaa): Fix setting pa_ret pointer in case of an error diff --git a/winsup/cygwin/pseudo-reloc.cc b/winsup/cygwin/pseudo-reloc.cc index 00c58d7a8..bdcde2a4b 100644 --- a/winsup/cygwin/pseudo-reloc.cc +++ b/winsup/cygwin/pseudo-reloc.cc @@ -85,12 +85,12 @@ __report_error (const char *msg, ...) * cygwin ptys. */ char buf[128]; - WCHAR module[MAX_PATH]; + WCHAR module[PATH_MAX]; char * posix_module = NULL; static const char UNKNOWN_MODULE[] = ": "; static const char CYGWIN_FAILURE_MSG[] = "Cygwin runtime failure: "; HANDLE errh = GetStdHandle (STD_ERROR_HANDLE); - ssize_t modulelen = GetModuleFileNameW (NULL, module, sizeof (module)); + ssize_t modulelen = GetModuleFileNameW (NULL, module, PATH_MAX); va_list args; /* FIXME: cleanup further to avoid old use of cygwin_internal */ -- 2.43.5