public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Cygwin: drop last usage of RtlCreateUnicodeStringFromAsciiz
@ 2022-08-05 9:46 Corinna Vinschen
0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2022-08-05 9:46 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=d097a96e6e5319ab622d5d737c70b21e4a231bec
commit d097a96e6e5319ab622d5d737c70b21e4a231bec
Author: Corinna Vinschen <corinna@vinschen.de>
Date: Fri Aug 5 11:45:49 2022 +0200
Cygwin: drop last usage of RtlCreateUnicodeStringFromAsciiz
This function is just bad. It really only works for ASCII
chars, everything else is broken after the conversion.
Introduce new helper function sys_mbstouni to replace
RtlCreateUnicodeStringFromAsciiz in hash_path_name.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
winsup/cygwin/ntdll.h | 3 ++-
winsup/cygwin/path.cc | 6 ++++--
winsup/cygwin/wchar.h | 12 ++++++++++++
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index bdc1c1e40..0f2310882 100644
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -1556,7 +1556,8 @@ extern "C"
NTSTATUS RtlCreateAcl (PACL, ULONG, ULONG);
PDEBUG_BUFFER RtlCreateQueryDebugBuffer (ULONG, BOOLEAN);
NTSTATUS RtlCreateSecurityDescriptor (PSECURITY_DESCRIPTOR, ULONG);
- BOOLEAN RtlCreateUnicodeStringFromAsciiz (PUNICODE_STRING, PCSTR);
+ /* Don't use this function! It's almost always wrong! */
+ // BOOLEAN RtlCreateUnicodeStringFromAsciiz (PUNICODE_STRING, PCSTR);
NTSTATUS RtlDeleteSecurityObject (PSECURITY_DESCRIPTOR *);
NTSTATUS RtlDestroyQueryDebugBuffer (PDEBUG_BUFFER);
NTSTATUS RtlDowncaseUnicodeString (PUNICODE_STRING, PUNICODE_STRING, BOOLEAN);
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index b159b56d0..3e436dc65 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -3686,9 +3686,11 @@ ino_t
hash_path_name (ino_t hash, const char *name)
{
UNICODE_STRING uname;
- RtlCreateUnicodeStringFromAsciiz (&uname, name);
+ tmp_pathbuf tp;
+
+ tp.u_get (&uname);
+ sys_mbstouni (&uname, HEAP_NOTHEAP, name);
ino_t ret = hash_path_name (hash, &uname);
- RtlFreeUnicodeString (&uname);
return ret;
}
diff --git a/winsup/cygwin/wchar.h b/winsup/cygwin/wchar.h
index ff1d4f1fa..0484b27d5 100644
--- a/winsup/cygwin/wchar.h
+++ b/winsup/cygwin/wchar.h
@@ -91,10 +91,22 @@ sys_mbstowcs (wchar_t * dst, size_t dlen, const char *src,
size_t sys_mbstowcs_alloc (wchar_t **, int, const char *, size_t = (size_t) -1);
+static inline size_t
+sys_mbstouni (PUNICODE_STRING dst, int type, const char *src,
+ size_t nms = (size_t) -1)
+{
+ /* sys_mbstowcs returns length *excluding* trailing \0 */
+ size_t len = sys_mbstowcs (dst->Buffer, type, src, nms);
+ dst->Length = len * sizeof (WCHAR);
+ dst->MaximumLength = dst->Length + sizeof (WCHAR);
+ return dst->Length;
+}
+
static inline size_t
sys_mbstouni_alloc (PUNICODE_STRING dst, int type, const char *src,
size_t nms = (size_t) -1)
{
+ /* sys_mbstowcs returns length *including* trailing \0 */
size_t len = sys_mbstowcs_alloc (&dst->Buffer, type, src, nms);
dst->MaximumLength = len * sizeof (WCHAR);
dst->Length = dst->MaximumLength - sizeof (WCHAR);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-08-05 9:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05 9:46 [newlib-cygwin] Cygwin: drop last usage of RtlCreateUnicodeStringFromAsciiz Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).