diff options
author | David Robillard <d@drobilla.net> | 2018-12-26 20:08:31 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2019-04-13 19:15:32 +0200 |
commit | 62983c9a77d8aa0df72f6efbc30eedc901870d97 (patch) | |
tree | 7e93d3aee463fcecd539779624ca53e289b107d7 /src/node.c | |
parent | 696b558616bec2d2259bf901d2d94728e0cb0b74 (diff) | |
download | serd-62983c9a77d8aa0df72f6efbc30eedc901870d97.tar.gz serd-62983c9a77d8aa0df72f6efbc30eedc901870d97.tar.bz2 serd-62983c9a77d8aa0df72f6efbc30eedc901870d97.zip |
Ensure serd_new_resolved_uri returns an absolute URI or NULL
Diffstat (limited to 'src/node.c')
-rw-r--r-- | src/node.c | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -359,14 +359,22 @@ serd_node_resolve(const SerdNode* node, const SerdNode* base) SerdNode* serd_new_resolved_uri_i(const char* str, const SerdURI* base) { + SerdNode* result = NULL; if (!str || str[0] == '\0') { // Empty URI => Base URI, or nothing if no base is given - return base ? serd_new_from_uri(base, NULL) : NULL; + result = base ? serd_new_from_uri(base, NULL) : NULL; + } else { + SerdURI uri; + serd_uri_parse(str, &uri); + result = serd_new_from_uri(&uri, base); } - SerdURI uri; - serd_uri_parse(str, &uri); - return serd_new_from_uri(&uri, base); + if (!serd_uri_string_has_scheme(serd_node_get_string(result))) { + serd_node_free(result); + return NULL; + } + + return result; } static inline bool |