diff options
author | David Robillard <d@drobilla.net> | 2018-10-28 16:57:18 +0100 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2018-11-25 22:12:47 +0100 |
commit | 27249b15a561221ae693a6f26e817eb65d19404d (patch) | |
tree | 73ec84c27bd9192d56663cec4d143139857eb98a /src/node.c | |
parent | 505209a2ff35c2b880cc64712932fd4d11aeaf8d (diff) | |
download | serd-27249b15a561221ae693a6f26e817eb65d19404d.tar.gz serd-27249b15a561221ae693a6f26e817eb65d19404d.tar.bz2 serd-27249b15a561221ae693a6f26e817eb65d19404d.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
@@ -357,14 +357,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 |