mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-02 22:34:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

OCI: Don't crash if mediaType field missing in flatpak_oci_versioned_from_json

Browse Source
This commit is contained in:
Alexander Larsson
2019-06-13 12:48:10 +02:00
parent 94ed2946ab
commit 83c2bdf077
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/flatpak-json-oci.c
View File

@@ -173,11 +173,12 @@ flatpak_oci_versioned_init (FlatpakOciVersioned *self)
}
FlatpakOciVersioned *
flatpak_oci_versioned_from_json (GBytes *bytes, GError **error)
flatpak_oci_versioned_from_json (GBytes *bytes,
GError **error)
{
g_autoptr(JsonParser) parser = NULL;
JsonNode *root = NULL;
const gchar *mediatype;
const gchar *mediatype = NULL;
JsonObject *object;
parser = json_parser_new ();
@@ -190,7 +191,9 @@ flatpak_oci_versioned_from_json (GBytes *bytes, GError **error)
root = json_parser_get_root (parser);
object = json_node_get_object (root);
mediatype = json_object_get_string_member (object, "mediaType");
if (json_object_has_member (object, "mediaType"))
mediatype = json_object_get_string_member (object, "mediaType");
if (mediatype == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,