Improve add and chop prefix functions when given empty strings

2 files changed, 10 insertions, 8 deletions

diff --git a/src/reader.c b/src/reader.c
index a11ba2ce..171d450f 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -198,14 +198,15 @@ serd_reader_free(SerdReader* reader)
 }
 
 void
-serd_reader_add_blank_prefix(SerdReader* reader,
-                             const char* prefix)
+serd_reader_add_blank_prefix(SerdReader* reader, const char* prefix)
 {
 	free(reader->bprefix);
 	reader->bprefix_len = 0;
 	reader->bprefix     = NULL;
-	if (prefix) {
-		reader->bprefix_len = strlen(prefix);
+
+	const size_t prefix_len = prefix ? strlen(prefix) : 0;
+	if (prefix_len) {
+		reader->bprefix_len = prefix_len;
 		reader->bprefix     = (char*)malloc(reader->bprefix_len + 1);
 		memcpy(reader->bprefix, prefix, reader->bprefix_len + 1);
 	}
diff --git a/src/writer.c b/src/writer.c
index 0fb12dc3..eab902c6 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -1042,14 +1042,15 @@ serd_writer_new(SerdWorld*      world,
 }
 
 void
-serd_writer_chop_blank_prefix(SerdWriter* writer,
-                              const char* prefix)
+serd_writer_chop_blank_prefix(SerdWriter* writer, const char* prefix)
 {
 	free(writer->bprefix);
 	writer->bprefix_len = 0;
 	writer->bprefix     = NULL;
-	if (prefix) {
-		writer->bprefix_len = strlen(prefix);
+
+	const size_t prefix_len = prefix ? strlen(prefix) : 0;
+	if (prefix_len) {
+		writer->bprefix_len = prefix_len;
 		writer->bprefix     = (char*)malloc(writer->bprefix_len + 1);
 		memcpy(writer->bprefix, prefix, writer->bprefix_len + 1);
 	}