Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in C http_source not being initialised

Browse Source
This commit is contained in:
Caelan Sayler
2025-01-11 08:52:31 +00:00
committed by Caelan
parent d8234f3889
commit 49ade5af49
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib-cpp/src/lib.rs
View File

@@ -25,6 +25,7 @@ pub extern "C" fn vpkc_new_source_file(psz_file_path: *const c_char) -> *mut vpk
if let Some(update_path) = c_to_string_opt(psz_file_path) { if let Some(update_path) = c_to_string_opt(psz_file_path) {
UpdateSourceRawPtr::new(Box::new(sources::FileSource::new(update_path))) UpdateSourceRawPtr::new(Box::new(sources::FileSource::new(update_path)))
} else { } else {
log::error!("psz_file_path is null");
ptr::null_mut() ptr::null_mut()
} }
} }
@@ -35,8 +36,9 @@ pub extern "C" fn vpkc_new_source_file(psz_file_path: *const c_char) -> *mut vpk
#[logfn_inputs(Trace)] #[logfn_inputs(Trace)]
pub extern "C" fn vpkc_new_source_http_url(psz_http_url: *const c_char) -> *mut vpkc_update_source_t { pub extern "C" fn vpkc_new_source_http_url(psz_http_url: *const c_char) -> *mut vpkc_update_source_t {
if let Some(update_url) = c_to_string_opt(psz_http_url) { if let Some(update_url) = c_to_string_opt(psz_http_url) {
UpdateSourceRawPtr::new(Box::new(sources::FileSource::new(update_url))) UpdateSourceRawPtr::new(Box::new(sources::HttpSource::new(update_url)))
} else { } else {
log::error!("psz_http_url is null");
ptr::null_mut() ptr::null_mut()
} }
} }
@@ -56,6 +58,7 @@ pub extern "C" fn vpkc_new_source_custom_callback(
p_user_data: *mut c_void, p_user_data: *mut c_void,
) -> *mut vpkc_update_source_t { ) -> *mut vpkc_update_source_t {
if cb_release_feed.is_none() || cb_download_entry.is_none() || cb_free_release_feed.is_none() { if cb_release_feed.is_none() || cb_download_entry.is_none() || cb_free_release_feed.is_none() {
log::error!("cb_release_feed, cb_download_entry, or cb_free_release_feed is null");
return ptr::null_mut(); return ptr::null_mut();
} }

4
src/lib-rust/src/sources.rs
View File

@@ -91,8 +91,8 @@ pub struct HttpSource {
impl HttpSource { impl HttpSource {
/// Create a new HttpSource with the specified base URL. /// Create a new HttpSource with the specified base URL.
pub fn new(url: &str) -> HttpSource { pub fn new<S: AsRef<str>>(url: S) -> HttpSource {
HttpSource { url: url.to_owned() } HttpSource { url: url.as_ref().to_owned() }
} }
} }