From 3ac689401e7dae4e5224ece5955c03f2a84bd6d4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 9 Jul 2016 11:30:30 -0400 Subject: Fix construction of URIs with UTF-8 characters --- COPYING | 2 +- NEWS | 3 ++- src/sord.c | 5 ++--- wscript | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/COPYING b/COPYING index 3010008..7121a87 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright 2011-2014 David Robillard +Copyright 2011-2016 David Robillard Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/NEWS b/NEWS index 594628f..3fb5c07 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ sord (0.15.1) unstable; + * Fix construction and comparison of URIs with UTF-8 characters * Fix documentation generation * Return error from sord_inserter_write_statement() if a node can not be written (e.g. undefined prefix) @@ -7,7 +8,7 @@ sord (0.15.1) unstable; * Safely return NULL from sord_iter_get() for end iterators * Add sord_node_get_string_measured() to get both byte and character counts - -- David Robillard Thu, 17 Mar 2016 21:38:13 -0400 + -- David Robillard Sat, 09 Jul 2016 11:28:24 -0400 sord (0.14.0) stable; diff --git a/src/sord.c b/src/sord.c index 22732c9..4eb1664 100644 --- a/src/sord.c +++ b/src/sord.c @@ -1,5 +1,5 @@ /* - Copyright 2011-2014 David Robillard + Copyright 2011-2016 David Robillard Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -1151,8 +1151,7 @@ sord_node_from_serd_node(SordWorld* world, memcpy(buf + uri_prefix.len, uri_suffix.buf, uri_suffix.len); buf[uri_len] = '\0'; ret = sord_new_uri_counted( - world, buf, uri_prefix.len + uri_suffix.len, - uri_prefix.len + uri_suffix.len, false); // FIXME: UTF-8 + world, buf, uri_len, serd_strlen(buf, NULL, NULL), false); return ret; } case SERD_BLANK: diff --git a/wscript b/wscript index 5fcd76e..a44d924 100644 --- a/wscript +++ b/wscript @@ -63,7 +63,7 @@ def configure(conf): conf.check_cc(lib='gcov', define_name='HAVE_GCOV', mandatory=False) autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD', - atleast_version='0.18.0', mandatory=True) + atleast_version='0.22.4', mandatory=True) autowaf.check_pkg(conf, 'libpcre', uselib_store='PCRE', mandatory=False) if conf.env.HAVE_PCRE: -- cgit v1.2.1