Merge branch 'master' of ssh://git.code.sf.net/p/mingw-w64/mingw-w64
diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 8b13789..0ed4430 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1 +1,5 @@
+2014-05-19 Corinna Vinschen <vinschen@redhat.com>
+ * crt/pseudo-reloc.c (__report_error): Keep in sync with Cygwin version:
+ Raise size of module name buffer to PATH_MAX. Fix length in call to
+ GetModuleFileNameW.
diff --git a/mingw-w64-crt/crt/pseudo-reloc.c b/mingw-w64-crt/crt/pseudo-reloc.c
index 542f951..4e7f31b 100644
--- a/mingw-w64-crt/crt/pseudo-reloc.c
+++ b/mingw-w64-crt/crt/pseudo-reloc.c
@@ -92,7 +92,7 @@
* cygwin ptys.
*/
char buf[SHORT_MSG_BUF_SZ];
- wchar_t module[MAX_PATH];
+ wchar_t module[PATH_MAX];
char * posix_module = NULL;
static const char UNKNOWN_MODULE[] = "<unknown module>: ";
static const size_t UNKNOWN_MODULE_LEN = sizeof (UNKNOWN_MODULE) - 1;
@@ -102,7 +102,7 @@
DWORD done;
va_list args;
HANDLE errh = GetStdHandle (STD_ERROR_HANDLE);
- ssize_t modulelen = GetModuleFileNameW (NULL, module, sizeof (module));
+ ssize_t modulelen = GetModuleFileNameW (NULL, module, PATH_MAX);
if (errh == INVALID_HANDLE_VALUE)
cygwin_internal (CW_EXIT_PROCESS,
