Skip to content

fix(updater): panic when updating with empty current_exe_args #2434

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

Draft
wants to merge 2 commits into
base: v2
Choose a base branch
from
Draft

fix(updater): panic when updating with empty current_exe_args #2434

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90df48f
fix(updater): panic when updating with empty current_exe_args (#2335)
talzion12 Jan 19, 2025
e7b7a8d
fix formatting
talzion12 Feb 17, 2025
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
36 changes: 26 additions & 10 deletions plugins/updater/src/updater.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,12 @@ impl Update {
let updater_type = self.extract(bytes)?;

let install_mode = self.config.install_mode();
let current_args = &self.current_exe_args()[1..];
let current_exe_args = self.current_exe_args();
let current_args = current_exe_args
.split_first()
.map(|(_, args_without_exe)| args_without_exe)
.unwrap_or(&[]);

let msi_args;

let installer_args: Vec<&OsStr> = match &updater_type {
Expand All @@ -640,25 +645,36 @@ impl Update {
.iter()
.map(OsStr::new)
.chain(once(OsStr::new("/UPDATE")))
.chain(once(OsStr::new("/ARGS")))
.chain(current_args.to_vec())
.chain(
if current_args.len() > 0 {
Some(once(OsStr::new("/ARGS")).chain(current_args.iter().map(|arg| *arg)))
} else {
None
}
.into_iter()
.flatten(),
)
.chain(self.installer_args())
.collect(),
WindowsUpdaterType::Msi { path, .. } => {
let escaped_args = current_args
.iter()
.map(escape_msi_property_arg)
.collect::<Vec<_>>()
.join(" ");
msi_args = OsString::from(format!("LAUNCHAPPARGS=\"{escaped_args}\""));
if current_args.len() > 0 {
let escaped_args = current_args
.iter()
.map(escape_msi_property_arg)
.collect::<Vec<_>>()
.join(" ");
msi_args = Some(OsString::from(format!("LAUNCHAPPARGS=\"{escaped_args}\"")));
} else {
msi_args = None;
}

[OsStr::new("/i"), path.as_os_str()]
.into_iter()
.chain(install_mode.msiexec_args().iter().map(OsStr::new))
.chain(once(OsStr::new("/promptrestart")))
.chain(self.installer_args())
.chain(once(OsStr::new("AUTOLAUNCHAPP=True")))
.chain(once(msi_args.as_os_str()))
.chain(msi_args.iter().map(|args| args.as_os_str()))
.collect()
}
};
Expand Down
Loading