Skip to content

Preserve surrogates in winreg QueryValue results #9602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 1 commit into from
Nov 4, 2026
Merged

Preserve surrogates in winreg QueryValue results #9602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions crates/host_env/src/winreg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
extern crate alloc;

use alloc::string::FromUtf16Error;
use rustpython_wtf8::Wtf8Buf;

use windows_sys::Win32::{
Foundation,
Expand Down Expand Up @@ -355,6 +356,23 @@ pub fn query_default_value(
hkey: Registry::HKEY,
sub_key: Option<&widestring::WideCStr>,
) -> Result<String, QueryStringError> {
query_default_value_with(hkey, sub_key, |value| {
String::from_utf16(value).map_err(QueryStringError::Utf16)
})
}

pub fn query_default_value_wtf8(
hkey: Registry::HKEY,
sub_key: Option<&widestring::WideCStr>,
) -> Result<Wtf8Buf, QueryStringError> {
query_default_value_with(hkey, sub_key, |value| Ok(Wtf8Buf::from_wide(value)))
}

fn query_default_value_with<T>(
hkey: Registry::HKEY,
sub_key: Option<&widestring::WideCStr>,
decode: impl Fn(&[u16]) -> Result<T, QueryStringError>,
) -> Result<T, QueryStringError> {
let child_key = if let Some(sub_key) = sub_key.filter(|s| !s.is_empty()) {
let mut out_key = core::ptr::null_mut();
let res = unsafe {
Expand Down Expand Up @@ -396,7 +414,7 @@ pub fn query_default_value(
continue;
}
if res == Foundation::ERROR_FILE_NOT_FOUND {
break Ok(String::new());
break decode(&[]);
}
if res != 0 {
break Err(QueryStringError::Code(res));
Expand All @@ -410,7 +428,7 @@ pub fn query_default_value(
.iter()
.position(|&c| c == 0)
.unwrap_or(u16_slice.len());
break String::from_utf16(&u16_slice[..len]).map_err(QueryStringError::Utf16);
break decode(&u16_slice[..len]);
};

if let Some(ck) = child_key {
Expand Down
9 changes: 7 additions & 2 deletions crates/vm/src/stdlib/winreg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,11 @@ mod winreg {
}

#[pyfunction]
fn QueryValue(key: HKEYArg, sub_key: Option<String>, vm: &VirtualMachine) -> PyResult<String> {
fn QueryValue(
key: HKEYArg,
sub_key: Option<String>,
vm: &VirtualMachine,
) -> PyResult<PyRef<PyStr>> {
let hkey = key.0;

if hkey == host_winreg::HKEY_PERFORMANCE_DATA {
Expand All @@ -636,7 +640,8 @@ mod winreg {
.map(WideCString::from_str)
.transpose()
.map_err(|e| e.to_pyexception(vm))?;
host_winreg::query_default_value(hkey, sub_key.as_deref())
host_winreg::query_default_value_wtf8(hkey, sub_key.as_deref())
.map(|value| vm.ctx.new_str(value))
.map_err(|err| err.to_pyexception(vm))
}

Expand Down
Loading