diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-09-22 21:32:52 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-09-22 21:32:52 +0000 |
| commit | d92d731fa51ccf56bda4ff9010d271b62f774bec (patch) | |
| tree | ae20a6bfbdad4356072b1bcefa47ec4311c0da8d | |
| parent | c7a8c97efbcad5b48f6822817b3a07ab740fd6ae (diff) | |
| download | cygnal-d92d731fa51ccf56bda4ff9010d271b62f774bec.tar.gz cygnal-d92d731fa51ccf56bda4ff9010d271b62f774bec.tar.bz2 cygnal-d92d731fa51ccf56bda4ff9010d271b62f774bec.zip | |
2003-09-22 Roland Schwingel <rolandschwingel@users.sourceforge.net>
* mingwex/dirent.c (_topendir): Allocate enough memory for
DIR struct in UNICODE case too.
| -rw-r--r-- | winsup/mingw/ChangeLog | 11 | ||||
| -rw-r--r-- | winsup/mingw/mingwex/dirent.c | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 0692ecbd5..829ecf07a 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +2003-09-22 Roland Schwingel <rolandschwingel@users.sourceforge.net> + + * mingwex/dirent.c (_topendir): Allocate enough memory for + DIR struct in UNICODE case too. + 2003-09-15 Earnie Boyd <earnie@users.sf.net> * include/_mingw.h: Increment version to 3.2. @@ -888,10 +893,10 @@ (atexit): Force use of private atexit table via _dllonexit, (_onexit): New function. Force use of private atexit table via _dllonexit, - * mscvrt.def (atexit, _onexit): Add DATA keyword so that only + * msvcrt.def (atexit, _onexit): Add DATA keyword so that only _imp_<_symbol> is visible in import lib. - * mscvrt20.def: Likewise. - * mscvrt40.def: Likewise. + * msvcrt20.def: Likewise. + * msvcrt40.def: Likewise. * crtdll.def: Likewise. 2002-04-26 Danny Smith <dannysmith@users.sourceforge.net> diff --git a/winsup/mingw/mingwex/dirent.c b/winsup/mingw/mingwex/dirent.c index 20d1921d7..e3c81e1b2 100644 --- a/winsup/mingw/mingwex/dirent.c +++ b/winsup/mingw/mingwex/dirent.c @@ -76,8 +76,8 @@ _topendir (const _TCHAR *szPath) /* Allocate enough space to store DIR structure and the complete * directory path given. */ - nd = (_TDIR *) malloc (sizeof (_TDIR) + _tcslen (szFullPath) + _tcslen (SLASH) + - _tcslen (SUFFIX)); + nd = (_TDIR *) malloc (sizeof (_TDIR) + (_tcslen(szFullPath) + _tcslen (SLASH) + + _tcslen(SUFFIX) + 1) * sizeof(_TCHAR)); if (!nd) { |