libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* path.cc (path_conv::get_nt_native_path): Avoid dereferencing path when it is 

NULL.
This commit is contained in:
Christopher Faylor 2011-10-23 17:19:17 +00:00
parent 6ae28c2263
commit 1f012519e4
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2011-10-23 Christopher Faylor <me.cygwin2011@cgf.cx>
* path.cc (path_conv::get_nt_native_path): Avoid dereferencing path
when it is NULL.
2011-10-21 Christopher Faylor <me.cygwin2011@cgf.cx> 2011-10-21 Christopher Faylor <me.cygwin2011@cgf.cx>
* dtable.cc (dtable::delete_archetype): Improve debugging output. * dtable.cc (dtable::delete_archetype): Improve debugging output.
@ -33,6 +38,10 @@
(operator <<): New function. (operator <<): New function.
(operator =): Use eq_worker to perform old functionality. (operator =): Use eq_worker to perform old functionality.
* child_info.h (NPROCS): Move here from sigproc.cc.
(child_info::nprocs): New field. Not used yet.
(child_info::children):: Ditto.
2011-10-21 Corinna Vinschen <corinna@vinschen.de> 2011-10-21 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (fhandler_disk_file::rmdir): Check invalid * fhandler_disk_file.cc (fhandler_disk_file::rmdir): Check invalid

10
winsup/cygwin/path.cc
View File

@ -450,15 +450,21 @@ get_nt_native_path (const char *path, UNICODE_STRING& upath, bool dos)
PUNICODE_STRING PUNICODE_STRING
path_conv::get_nt_native_path () path_conv::get_nt_native_path ()
{ {
if (!wide_path) PUNICODE_STRING res;
if (wide_path)
res = &uni_path;
else if (!path)
res = NULL;
else
{ {
uni_path.Length = 0; uni_path.Length = 0;
uni_path.MaximumLength = (strlen (path) + 10) * sizeof (WCHAR); uni_path.MaximumLength = (strlen (path) + 10) * sizeof (WCHAR);
wide_path = (PWCHAR) cmalloc_abort (HEAP_STR, uni_path.MaximumLength); wide_path = (PWCHAR) cmalloc_abort (HEAP_STR, uni_path.MaximumLength);
uni_path.Buffer = wide_path; uni_path.Buffer = wide_path;
::get_nt_native_path (path, uni_path, has_dos_filenames_only ()); ::get_nt_native_path (path, uni_path, has_dos_filenames_only ());
res = &uni_path;
} }
return &uni_path; return res;
} }
PWCHAR PWCHAR