diff options
| author | David Robillard <d@drobilla.net> | 2014-12-10 19:29:36 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-12-10 19:29:36 +0000 |
| commit | cb580bb689733d8db0921f2a3a2232133b9d26b5 (patch) | |
| tree | 0c88c4a6d1d0834c2cdbaeff7ec298f660c8b69b | |
| parent | 25e6a687388f217debc3b890a9334e21a0a523ac (diff) | |
| download | serd-cb580bb689733d8db0921f2a3a2232133b9d26b5.tar.gz serd-cb580bb689733d8db0921f2a3a2232133b9d26b5.tar.bz2 serd-cb580bb689733d8db0921f2a3a2232133b9d26b5.zip | |
Fix serd_reader_read_file() for URIs with escaped characters (spaces).
git-svn-id: http://svn.drobilla.net/serd/trunk@479 490d8e77-9747-427b-9fa3-0b8f29cee8a0
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/reader.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -1,10 +1,11 @@ serd (0.21.0) unstable; * Remove dependence on fmax() to avoid portability issues + * Fix serd_reader_read_file() for URIs with escaped characters (spaces) * Report errors for invalid IRI characters and missing terminators * Fix warnings when building with ISO C++ compilers - -- David Robillard <d@drobilla.net> Tue, 09 Dec 2014 16:24:15 -0500 + -- David Robillard <d@drobilla.net> Wed, 10 Dec 2014 14:29:19 -0500 serd (0.20.0) stable; diff --git a/src/reader.c b/src/reader.c index 12d81fac..80f1c2ed 100644 --- a/src/reader.c +++ b/src/reader.c @@ -1553,18 +1553,20 @@ SerdStatus serd_reader_read_file(SerdReader* reader, const uint8_t* uri) { - const uint8_t* path = serd_uri_to_path(uri); + uint8_t* const path = serd_file_uri_parse(uri, NULL); if (!path) { return SERD_ERR_BAD_ARG; } FILE* fd = serd_fopen((const char*)path, "r"); if (!fd) { + free(path); return SERD_ERR_UNKNOWN; } SerdStatus ret = serd_reader_read_file_handle(reader, fd, path); fclose(fd); + free(path); return ret; } |