proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-08 19:31:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Never allow the content checksum filename to be NULL

Browse Source 
This prevents a critical warning from gcab_folder_get_file_by_name()
This commit is contained in:
Richard Hughes 2019-01-28 11:39:40 +00:00
parent 51ddf18faa
commit 9d3ec971f3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fu-common-cab.c
View File

@ -68,7 +68,7 @@ fu_common_store_from_cab_release (XbNode *release, GCabCabinet *cabinet, GError
{ {
GCabFile *cabfile; GCabFile *cabfile;
GBytes *blob; GBytes *blob;
const gchar *csum_filename; const gchar *csum_filename = NULL;
const gchar *suffixes[] = { "asc", "p7b", "p7c", NULL }; const gchar *suffixes[] = { "asc", "p7b", "p7c", NULL };
g_autofree gchar *basename = NULL; g_autofree gchar *basename = NULL;
g_autofree gchar *release_key = NULL; g_autofree gchar *release_key = NULL;
@ -77,14 +77,13 @@ fu_common_store_from_cab_release (XbNode *release, GCabCabinet *cabinet, GError
/* ensure we always have a content checksum */ /* ensure we always have a content checksum */
csum_tmp = xb_node_query_first (release, "checksum[@target='content']", NULL); csum_tmp = xb_node_query_first (release, "checksum[@target='content']", NULL);
if (csum_tmp != NULL) { if (csum_tmp != NULL)
csum_filename = xb_node_get_attr (csum_tmp, "filename"); csum_filename = xb_node_get_attr (csum_tmp, "filename");
} else {
/* if this isn't true, a firmware needs to set in /* if this isn't true, a firmware needs to set in the metainfo.xml file
* the metainfo.xml file something like: * something like: <checksum target="content" filename="FLASH.ROM"/> */
* <checksum target="content" filename="FLASH.ROM"/> */ if (csum_filename == NULL)
csum_filename = "firmware.bin"; csum_filename = "firmware.bin";
}
/* get the main firmware file */ /* get the main firmware file */
basename = g_path_get_basename (csum_filename); basename = g_path_get_basename (csum_filename);