vrr/zed
2
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-07-10 00:13:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

explorer_command_injector: Avoid COM out-pointer overwrite in class factory exports (#49210)

Browse source 
Release Notes:

- N/A

Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
This commit is contained in:
Xiaobo Liu 2026-03-01 11:42:19 +08:00 • committed by GitHub
parent 6a4dfd46ba
commit ce1517a3a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/explorer_command_injector/src/explorer_command_injector.rs
View file

@ -106,18 +106,17 @@ impl IClassFactory_Impl for ExplorerCommandInjectorFactory_Impl {
riid: *const windows_core::GUID,
ppvobject: *mut *mut core::ffi::c_void,
) -> Result<()> {
if ppvobject.is_null() || riid.is_null() {
return Err(windows::Win32::Foundation::E_POINTER.into());
}
unsafe {
*ppvobject = std::ptr::null_mut();
}
if punkouter.is_none() {
let factory: IExplorerCommand = ExplorerCommandInjector {}.into();
let ret = unsafe { factory.query(riid, ppvobject).ok() };
if ret.is_ok() {
unsafe {
*ppvobject = factory.into_raw();
}
}
ret
unsafe { factory.query(riid, ppvobject).ok() }
} else {
Err(E_INVALIDARG.into())
}
@ -145,19 +144,17 @@ extern "system" fn DllGetClassObject(
iid: *const GUID,
out: *mut *mut std::ffi::c_void,
) -> HRESULT {
if out.is_null() || class_id.is_null() || iid.is_null() {
return E_INVALIDARG;
}
unsafe {
*out = std::ptr::null_mut();
}
let class_id = unsafe { *class_id };
if class_id == MODULE_ID {
let instance: IClassFactory = ExplorerCommandInjectorFactory {}.into();
let ret = unsafe { instance.query(iid, out) };
if ret.is_ok() {
unsafe {
*out = instance.into_raw();
}
}
ret
unsafe { instance.query(iid, out) }
} else {
CLASS_E_CLASSNOTAVAILABLE
}