From e568f4e41b3ccbd89f156eeb51bc42f424701a55 Mon Sep 17 00:00:00 2001
From: Evan Huff <ehuff007@gmail.com>
Date: Thu, 5 Dec 2024 21:00:46 -0500
Subject: [PATCH] fix: fix HSTRING being dropped, causing NERR_UserNotFound
 errors

---
 src/windows/users.rs | 23 +++++++++++++++++------
 src/windows/utils.rs |  9 ---------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/windows/users.rs b/src/windows/users.rs
index bc25dc817..ef88a8329 100644
--- a/src/windows/users.rs
+++ b/src/windows/users.rs
@@ -4,7 +4,7 @@ use crate::sys::utils::to_utf8_str;
 use crate::{windows::sid::Sid, Gid, Group, GroupInner, Uid, User};
 
 use std::ptr::null_mut;
-use windows::core::{w, PCWSTR};
+use windows::core::PCWSTR;
 use windows::Win32::Foundation::{ERROR_MORE_DATA, LUID};
 use windows::Win32::NetworkManagement::NetManagement::{
     NERR_Success, NetApiBufferFree, NetUserEnum, NetUserGetInfo, NetUserGetLocalGroups,
@@ -16,8 +16,6 @@ use windows::Win32::Security::Authentication::Identity::{
     SECURITY_LOGON_SESSION_DATA, SECURITY_LOGON_TYPE,
 };
 
-use super::utils::to_pcwstr;
-
 pub(crate) struct UserInner {
     pub(crate) uid: Uid,
     pub(crate) gid: Gid,
@@ -56,7 +54,16 @@ impl UserInner {
 
     pub(crate) fn groups(&self) -> Vec<Group> {
         if let (Some(c_user_name), true) = (&self.c_user_name, self.is_local) {
-            unsafe { get_groups_for_user(to_pcwstr(c_user_name.to_vec())) }
+            // Convert the wide string to a PCWSTR, and ensure it has a null terminator.
+            // Since the Vec is created here, we can ensure it will not be dropped prematurely.
+            let username = {
+                let mut null_terminated = c_user_name.to_vec();
+                if null_terminated.last().is_some_and(|v| *v != 0) {
+                    null_terminated.push(0);
+                }
+                null_terminated
+            };
+            unsafe { get_groups_for_user(PCWSTR::from_raw(username.as_ptr())) }
         } else {
             Vec::new()
         }
@@ -115,14 +122,18 @@ impl<T> LsaBuffer<T> {
     }
 }
 
+/// Get the groups for a user.
+///
+/// # Safety
+/// The caller must ensure that the `username` is a valid wide Unicode string with a null terminator.
 unsafe fn get_groups_for_user(username: PCWSTR) -> Vec<Group> {
     let mut buf: NetApiBuffer<LOCALGROUP_USERS_INFO_0> = Default::default();
     let mut nb_entries = 0;
     let mut total_entries = 0;
-    let mut groups;
+    let mut groups: Vec<Group>;
 
     let status = NetUserGetLocalGroups(
-        w!(""),
+        PCWSTR::null(),
         username,
         0,
         LG_INCLUDE_INDIRECT,
diff --git a/src/windows/utils.rs b/src/windows/utils.rs
index 762df1e5a..3d42babb2 100644
--- a/src/windows/utils.rs
+++ b/src/windows/utils.rs
@@ -17,15 +17,6 @@ pub(crate) unsafe fn to_utf8_str(p: windows::core::PWSTR) -> String {
     })
 }
 
-#[cfg(any(feature = "user", feature = "system"))]
-pub(crate) unsafe fn to_pcwstr(v: Vec<u16>) -> windows::core::PCWSTR {
-    if v.is_empty() {
-        return windows::core::PCWSTR::null();
-    }
-    let string = String::from_utf16(&v).unwrap_or_default();
-    windows::core::PCWSTR(windows::core::HSTRING::from(&format!("{}\0", string)).as_ptr())
-}
-
 cfg_if! {
     if #[cfg(any(feature = "disk", feature = "system"))] {
         use windows::Win32::Foundation::{CloseHandle, HANDLE};