Skip to content
Snippets Groups Projects
Commit 967cf69d authored by Simon McVittie's avatar Simon McVittie
Browse files

library: Guard against not knowing missing or misversioned symbols

parent a4b26187
No related branches found
No related tags found
1 merge request!31Log an issue if we don't know which shared libraries to expect
...@@ -440,9 +440,9 @@ srt_check_library_presence (const char *soname, ...@@ -440,9 +440,9 @@ srt_check_library_presence (const char *soname,
JsonParser *parser = NULL; JsonParser *parser = NULL;
JsonNode *node = NULL; JsonNode *node = NULL;
JsonObject *json; JsonObject *json;
JsonArray *missing_array; JsonArray *missing_array = NULL;
JsonArray *misversioned_array; JsonArray *misversioned_array = NULL;
JsonArray *dependencies_array; JsonArray *dependencies_array = NULL;
GError *error = NULL; GError *error = NULL;
GStrv missing_symbols = NULL; GStrv missing_symbols = NULL;
GStrv misversioned_symbols = NULL; GStrv misversioned_symbols = NULL;
...@@ -521,7 +521,8 @@ srt_check_library_presence (const char *soname, ...@@ -521,7 +521,8 @@ srt_check_library_presence (const char *soname,
absolute_path = g_strdup (json_object_get_string_member (json, "path")); absolute_path = g_strdup (json_object_get_string_member (json, "path"));
missing_array = json_object_get_array_member (json, "missing_symbols"); if (json_object_has_member (json, "missing_symbols"))
missing_array = json_object_get_array_member (json, "missing_symbols");
if (missing_array != NULL) if (missing_array != NULL)
{ {
if (json_array_get_length (missing_array) > 0) if (json_array_get_length (missing_array) > 0)
...@@ -536,7 +537,8 @@ srt_check_library_presence (const char *soname, ...@@ -536,7 +537,8 @@ srt_check_library_presence (const char *soname,
} }
} }
misversioned_array = json_object_get_array_member (json, "misversioned_symbols"); if (json_object_has_member (json, "misversioned_symbols"))
misversioned_array = json_object_get_array_member (json, "misversioned_symbols");
if (misversioned_array != NULL) if (misversioned_array != NULL)
{ {
if (json_array_get_length (misversioned_array) > 0) if (json_array_get_length (misversioned_array) > 0)
...@@ -551,7 +553,8 @@ srt_check_library_presence (const char *soname, ...@@ -551,7 +553,8 @@ srt_check_library_presence (const char *soname,
} }
} }
dependencies_array = json_object_get_array_member (json, "dependencies"); if (json_object_has_member (json, "dependencies"))
dependencies_array = json_object_get_array_member (json, "dependencies");
if (dependencies_array != NULL) if (dependencies_array != NULL)
{ {
dependencies = g_new0 (gchar *, json_array_get_length (dependencies_array) + 1); dependencies = g_new0 (gchar *, json_array_get_length (dependencies_array) + 1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment