mirrors/sprout
1
0
Fork 0
mirror of https://github.com/edera-dev/sprout.git synced 2026-02-04 13:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(eficore): unregister media loader on drop to prevent more opportunities for leaks (#50)

Browse Source
This commit is contained in:
Alex Zenla
2025-12-20 22:01:04 -08:00
committed by GitHub
parent 2da457ee7c
commit 17e729d068
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/eficore/src/media_loader.rs
View File

@@ -3,6 +3,7 @@ use alloc::vec::Vec;
use anyhow::{Context, Result, bail};
use core::ffi::c_void;
use core::ptr;
use log::error;
use uefi::proto::device_path::DevicePath;
use uefi::proto::device_path::build::DevicePathBuilder;
use uefi::proto::device_path::build::media::Vendor;
@@ -255,7 +256,7 @@ impl MediaLoaderHandle {
/// Unregisters a media loader from the UEFI stack.
/// This will free the memory allocated by the passed data.
pub fn unregister(self) -> Result<()> {
fn unregister(&self) -> Result<()> {
// SAFETY: We know that the media loader is registered if the handle is valid,
// so we can safely uninstall it.
// We should have allocated the pointers involved, so we can safely free them.
@@ -293,3 +294,14 @@ impl MediaLoaderHandle {
Ok(())
}
}
/// Implement drop for the handle to automatically unregister the media loader.
impl Drop for MediaLoaderHandle {
fn drop(&mut self) {
// If unregister fails, print an error to the log.
// This may leak stuff, but the only other option is to panic.
if let Err(error) = self.unregister() {
error!("unable to unregister media loader: {}", error);
}
}
}