From 88b95c5a431dfb2762309073184406d1eaa987bf Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 27 Apr 2014 00:30:33 +0000 Subject: Tolerate calling lilv_node_as_uri or lilv_node_as_blank on NULL. git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@5375 a436a847-0d15-0410-975c-d299462d15a1 --- NEWS | 3 ++- src/node.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 1ba6f28..ccecf36 100644 --- a/NEWS +++ b/NEWS @@ -5,8 +5,9 @@ lilv (0.18.1) unstable; * Fix minor memory leak in test suite * Call lv2_lib_descriptor separately for different bundle paths (fix loading several dynamic plugins like Ingen at once) + * Tolerate calling lilv_node_as_uri or lilv_node_as_blank on NULL - -- David Robillard Fri, 17 Jan 2014 20:34:10 -0500 + -- David Robillard Sat, 26 Apr 2014 20:29:27 -0400 lilv (0.18.0) stable; diff --git a/src/node.c b/src/node.c index 73dde29..e8756ac 100644 --- a/src/node.c +++ b/src/node.c @@ -296,8 +296,8 @@ LILV_API const char* lilv_node_as_uri(const LilvNode* value) { - assert(lilv_node_is_uri(value)); - return (const char*)sord_node_get_string(value->node); + assert(!value || lilv_node_is_uri(value)); + return value ? (const char*)sord_node_get_string(value->node) : NULL; } const SordNode* @@ -318,8 +318,8 @@ LILV_API const char* lilv_node_as_blank(const LilvNode* value) { - assert(lilv_node_is_blank(value)); - return (const char*)sord_node_get_string(value->node); + assert(!value || lilv_node_is_blank(value)); + return value ? (const char*)sord_node_get_string(value->node) : NULL; } LILV_API -- cgit v1.2.1