aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/env.c8
-rw-r--r--src/node.c8
-rw-r--r--src/reader.c96
-rw-r--r--src/serdi.c2
-rw-r--r--src/writer.c33
5 files changed, 62 insertions, 85 deletions
diff --git a/src/env.c b/src/env.c
index 7abe6791..2a63cf1d 100644
--- a/src/env.c
+++ b/src/env.c
@@ -132,7 +132,9 @@ serd_env_set_prefix(SerdEnv* env,
const SerdNode* name,
const SerdNode* uri_node)
{
- if (serd_uri_string_has_scheme(uri_node->buf)) {
+ if (!name->buf || !uri_node->buf || uri_node->type != SERD_URI) {
+ return SERD_ERR_BAD_ARG;
+ } else if (serd_uri_string_has_scheme(uri_node->buf)) {
// Set prefix to absolute URI
serd_env_add(env, name, uri_node);
} else {
@@ -141,10 +143,6 @@ serd_env_set_prefix(SerdEnv* env,
SerdNode abs_uri_node = serd_node_new_uri_from_node(
uri_node, &env->base_uri, &abs_uri);
- if (!abs_uri_node.buf) {
- return SERD_ERR_BAD_ARG;
- }
-
// Set prefix to resolved (absolute) URI
serd_env_add(env, name, &abs_uri_node);
serd_node_free(&abs_uri_node);
diff --git a/src/node.c b/src/node.c
index fbcbe1f5..59839e34 100644
--- a/src/node.c
+++ b/src/node.c
@@ -134,11 +134,7 @@ serd_node_new_uri(const SerdURI* uri, const SerdURI* base, SerdURI* out)
node.n_bytes = actual_len;
node.n_chars = actual_len;
- // FIXME: double parse
- if (serd_uri_parse(buf, out)) {
- fprintf(stderr, "Failed to parse URI <%s>\n", buf);
- return SERD_NODE_NULL;
- }
+ serd_uri_parse(buf, out); // TODO: cleverly avoid double parse
return node;
}
@@ -201,7 +197,7 @@ serd_node_new_integer(long i)
{
long abs_i = labs(i);
const long digits = (long)fmax(1.0, ceil(log10((double)abs_i + 1)));
- char* buf = calloc(digits + 1, 1);
+ char* buf = calloc(digits + 2, 1);
SerdNode node = { (const uint8_t*)buf, 0, 0, 0, SERD_LITERAL };
// Point s to the end
diff --git a/src/reader.c b/src/reader.c
index f99d5741..fbc7a711 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -490,26 +490,6 @@ read_character(SerdReader* reader, Ref dest)
}
}
-// [39] echaracter ::= character | '\t' | '\n' | '\r'
-static inline SerdStatus
-read_echaracter(SerdReader* reader, Ref dest)
-{
- SerdNodeFlags flags = 0;
- uint8_t c = peek_byte(reader);
- switch (c) {
- case '\\':
- eat_byte_safe(reader, '\\');
- if (read_echaracter_escape(reader, peek_byte(reader), &flags)) {
- return SERD_SUCCESS;
- } else {
- error(reader, "illegal escape `\\%c'\n", peek_byte(reader));
- return SERD_ERR_BAD_SYNTAX;
- }
- default:
- return read_character(reader, dest);
- }
-}
-
// [43] lcharacter ::= echaracter | '\"' | #x9 | #xA | #xD
static inline SerdStatus
read_lcharacter(SerdReader* reader, Ref dest, SerdNodeFlags* flags)
@@ -544,7 +524,7 @@ read_lcharacter(SerdReader* reader, Ref dest, SerdNodeFlags* flags)
push_byte(reader, dest, eat_byte_safe(reader, c));
return SERD_SUCCESS;
default:
- return read_echaracter(reader, dest);
+ return read_character(reader, dest);
}
}
@@ -581,7 +561,8 @@ read_ucharacter(SerdReader* reader, Ref dest)
if (read_ucharacter_escape(reader, dest)) {
return SERD_SUCCESS;
} else {
- return error(reader, "illegal escape `\\%c'\n", peek_byte(reader));
+ error(reader, "illegal escape `\\%c'\n", peek_byte(reader));
+ return SERD_FAILURE;
}
case '>':
return SERD_FAILURE;
@@ -703,17 +684,13 @@ read_relativeURI(SerdReader* reader)
// | [#x037F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF]
// | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
static inline uchar
-read_nameStartChar(SerdReader* reader, bool required)
+read_nameStartChar(SerdReader* reader)
{
const uint8_t c = peek_byte(reader);
if (c == '_' || is_alpha(c)) { // TODO: not strictly correct
return eat_byte_safe(reader, c);
- } else {
- if (required) {
- error(reader, "illegal character `%c'\n", c);
- }
- return 0;
}
+ return 0;
}
// [31] nameChar ::= nameStartChar | '-' | [0-9]
@@ -721,7 +698,7 @@ read_nameStartChar(SerdReader* reader, bool required)
static inline uchar
read_nameChar(SerdReader* reader)
{
- uchar c = read_nameStartChar(reader, false);
+ uchar c = read_nameStartChar(reader);
if (c)
return c;
@@ -745,12 +722,12 @@ read_prefixName(SerdReader* reader, Ref dest)
pop_node(reader, dest);
return 0;
}
- TRY_RET(c = read_nameStartChar(reader, false));
+ TRY_RET(c = read_nameStartChar(reader));
if (!dest) {
dest = push_node(reader, SERD_CURIE, "", 0);
}
push_byte(reader, dest, c);
- while ((c = read_nameChar(reader)) != 0) {
+ while ((c = read_nameChar(reader))) {
push_byte(reader, dest, c);
}
return dest;
@@ -760,7 +737,7 @@ read_prefixName(SerdReader* reader, Ref dest)
static Ref
read_name(SerdReader* reader, Ref dest, bool required)
{
- uchar c = read_nameStartChar(reader, required);
+ uchar c = read_nameStartChar(reader);
if (!c) {
if (required) {
error(reader, "illegal character at start of name\n");
@@ -921,36 +898,26 @@ read_resource(SerdReader* reader, Ref* dest)
return *dest != 0;
}
-// [14] literal ::= quotedString ( '@' language )? | datatypeString
-// | integer | double | decimal | boolean
static bool
read_literal(SerdReader* reader, Ref* dest,
Ref* datatype, Ref* lang, SerdNodeFlags* flags)
{
- Ref str = 0;
- const uint8_t c = peek_byte(reader);
- if (c == '-' || c == '+' || c == '.' || is_digit(c)) {
- return read_number(reader, dest, datatype);
- } else if (c == '\"') {
- str = read_quotedString(reader, flags);
- if (!str) {
- return false;
- }
+ Ref str = read_quotedString(reader, flags);
+ if (!str) {
+ return false;
+ }
- switch (peek_byte(reader)) {
- case '^':
- eat_byte_safe(reader, '^');
- eat_byte_check(reader, '^');
- TRY_THROW(read_resource(reader, datatype));
- break;
- case '@':
- eat_byte_safe(reader, '@');
- TRY_THROW(*lang = read_language(reader));
- }
- *dest = str;
- } else {
- return error(reader, "unknown literal type\n");
+ switch (peek_byte(reader)) {
+ case '^':
+ eat_byte_safe(reader, '^');
+ eat_byte_check(reader, '^');
+ TRY_THROW(read_resource(reader, datatype));
+ break;
+ case '@':
+ eat_byte_safe(reader, '@');
+ TRY_THROW(*lang = read_language(reader));
}
+ *dest = str;
return true;
except:
pop_node(reader, str);
@@ -1126,9 +1093,11 @@ read_object(SerdReader* reader, ReadContext ctx)
case '<': case ':':
TRY_THROW(ret = read_resource(reader, &o));
break;
- case '\"': case '+': case '-':
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9': case '.':
+ case '+': case '-': case '.': case '0': case '1': case '2': case '3':
+ case '4': case '5': case '6': case '7': case '8': case '9':
+ TRY_THROW(ret = read_number(reader, &o, &datatype));
+ break;
+ case '\"':
TRY_THROW(ret = read_literal(reader, &o, &datatype, &lang, &flags));
break;
default:
@@ -1470,16 +1439,15 @@ serd_reader_get_handle(const SerdReader* reader)
{
return reader->handle;
}
+
SERD_API
void
serd_reader_add_blank_prefix(SerdReader* reader,
const uint8_t* prefix)
{
- if (reader->bprefix) {
- free(reader->bprefix);
- reader->bprefix_len = 0;
- reader->bprefix = NULL;
- }
+ free(reader->bprefix);
+ reader->bprefix_len = 0;
+ reader->bprefix = NULL;
if (prefix) {
reader->bprefix_len = strlen((const char*)prefix);
reader->bprefix = malloc(reader->bprefix_len + 1);
diff --git a/src/serdi.c b/src/serdi.c
index 3fbc9165..e69b226d 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -149,7 +149,7 @@ main(int argc, char** argv)
in_name = in_name ? in_name : input;
if (!in_fd) {
input = serd_uri_to_path(in_name);
- if (!(in_fd = serd_fopen((const char*)input, "r"))) {
+ if (!input || !(in_fd = serd_fopen((const char*)input, "r"))) {
return 1;
}
}
diff --git a/src/writer.c b/src/writer.c
index 96f8d1e4..c388188e 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -163,6 +163,8 @@ write_text(SerdWriter* writer, TextContext ctx,
c = in & 0x07;
} else {
fprintf(stderr, "Invalid UTF-8 at offset %zu: %X\n", i, in);
+ const uint8_t replacement_char[] = { 0xEF, 0xBF, 0xBD };
+ sink(replacement_char, sizeof(replacement_char), writer);
return false;
}
@@ -249,8 +251,6 @@ write_node(SerdWriter* writer,
SerdChunk uri_prefix;
SerdChunk uri_suffix;
switch (node->type) {
- case SERD_NOTHING:
- return false;
case SERD_BLANK:
if (writer->syntax != SERD_NTRIPLES
&& ((field == FIELD_SUBJECT && (flags & SERD_ANON_S_BEGIN))
@@ -350,11 +350,23 @@ write_node(SerdWriter* writer,
sink("<", 1, writer);
write_text(writer, WRITE_URI, node->buf, node->n_bytes, '>');
sink(">", 1, writer);
- return true;
+ default:
+ break;
}
return true;
}
+static inline bool
+is_resource(const SerdNode* node)
+{
+ switch (node->type) {
+ case SERD_URI: case SERD_CURIE: case SERD_BLANK:
+ return true;
+ default:
+ return false;
+ }
+}
+
SERD_API
SerdStatus
serd_writer_write_statement(SerdWriter* writer,
@@ -366,7 +378,12 @@ serd_writer_write_statement(SerdWriter* writer,
const SerdNode* object_datatype,
const SerdNode* object_lang)
{
- assert(subject && predicate && object);
+ if (!subject || !predicate || !object
+ || !subject->buf || !predicate->buf || !object->buf
+ || !is_resource(subject) || !is_resource(predicate)) {
+ return SERD_ERR_BAD_ARG;
+ }
+
switch (writer->syntax) {
case SERD_NTRIPLES:
write_node(writer, subject, NULL, NULL, FIELD_SUBJECT, flags);
@@ -536,11 +553,9 @@ void
serd_writer_chop_blank_prefix(SerdWriter* writer,
const uint8_t* prefix)
{
- if (writer->bprefix) {
- free(writer->bprefix);
- writer->bprefix_len = 0;
- writer->bprefix = NULL;
- }
+ free(writer->bprefix);
+ writer->bprefix_len = 0;
+ writer->bprefix = NULL;
if (prefix) {
writer->bprefix_len = strlen((const char*)prefix);
writer->bprefix = malloc(writer->bprefix_len + 1);