aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-12-26 20:08:31 -0500
committerDavid Robillard <d@drobilla.net>2018-12-31 11:37:49 -0500
commit4a49f7d02aed06e76678da09d85cc8bc0bc3649c (patch)
tree4c03f010e453caec99fab8a27bc601d46222bd77
parentef3554df938fbe419615c270573d72994f0bb67d (diff)
downloadserd-4a49f7d02aed06e76678da09d85cc8bc0bc3649c.tar.gz
serd-4a49f7d02aed06e76678da09d85cc8bc0bc3649c.tar.bz2
serd-4a49f7d02aed06e76678da09d85cc8bc0bc3649c.zip
Ensure serd_new_resolved_uri returns an absolute URI or NULL
-rw-r--r--src/env.c5
-rw-r--r--src/node.c16
-rw-r--r--tests/serd_test.c4
3 files changed, 17 insertions, 8 deletions
diff --git a/src/env.c b/src/env.c
index 5a7c04fb..00585426 100644
--- a/src/env.c
+++ b/src/env.c
@@ -120,11 +120,10 @@ serd_env_set_base_uri(SerdEnv* env,
SerdNode* base_uri_node = serd_new_resolved_uri_i(
serd_node_get_string(uri), &env->base_uri);
- SerdURI base_uri;
- serd_uri_parse(serd_node_get_string(base_uri_node), &base_uri);
-
if (base_uri_node) {
// Replace the current base URI
+ SerdURI base_uri;
+ serd_uri_parse(serd_node_get_string(base_uri_node), &base_uri);
serd_node_free(env->base_uri_node);
env->base_uri_node = base_uri_node;
env->base_uri = base_uri;
diff --git a/src/node.c b/src/node.c
index 36b1af79..859cb0a3 100644
--- a/src/node.c
+++ b/src/node.c
@@ -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
diff --git a/tests/serd_test.c b/tests/serd_test.c
index acfcd604..9564af17 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -411,6 +411,7 @@ main(void)
SerdNode* eg = serd_new_uri("http://example.org/");
SerdNode* foo_u = serd_new_uri("http://example.org/foo");
+ SerdNode* empty = serd_new_uri("");
SerdNode* foo_c = serd_new_curie("eg.2:foo");
SerdNode* b = serd_new_curie("invalid");
SerdNode* pre = serd_new_curie("eg.2");
@@ -419,7 +420,7 @@ main(void)
assert(!serd_env_get_base_uri(env));
assert(serd_env_set_base_uri(env, NULL));
- assert(!serd_env_get_base_uri(env));
+ assert(serd_env_set_base_uri(env, empty));
assert(serd_env_set_base_uri(env, hello));
assert(!serd_env_get_base_uri(env));
@@ -474,6 +475,7 @@ main(void)
serd_node_free(qualified);
serd_node_free(foo_c);
+ serd_node_free(empty);
serd_node_free(foo_u);
serd_node_free(b);
serd_node_free(pre);