From 8c028e1a88c2d2aac4a4086202568bee43678aa8 Mon Sep 17 00:00:00 2001
From: Vicent Marti <tanoku@gmail.com>
Date: Wed, 10 Sep 2014 19:50:29 +0200
Subject: Do not create references with empty names

---
 src/buffer.c     |  7 ++++---
 src/references.c | 31 ++++++++++++++++++++++++++-----
 src/references.h |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/buffer.c b/src/buffer.c
index cdf8ca0..7c2b86b 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -215,11 +215,12 @@ unsigned char *strbuf_detach(strbuf *buf)
 {
 	unsigned char *data = buf->ptr;
 
-	if (buf->asize == 0 || buf->ptr == strbuf__oom)
-		return NULL;
+	if (buf->asize == 0 || buf->ptr == strbuf__oom) {
+		/* return an empty string */
+		return calloc(1, 1);
+	}
 
 	strbuf_init(buf, 0);
-
 	return data;
 }
 
diff --git a/src/references.c b/src/references.c
index 84cb773..300bbcc 100644
--- a/src/references.c
+++ b/src/references.c
@@ -23,15 +23,29 @@ static void reference_free(reference *ref)
 
 // normalize reference:  collapse internal whitespace to single space,
 // remove leading/trailing whitespace, case fold
+// Return NULL if the reference name is actually empty (i.e. composed
+// solely from whitespace)
 static unsigned char *normalize_reference(chunk *ref)
 {
 	strbuf normalized = GH_BUF_INIT;
+	unsigned char *result;
+
+	if (ref->len == 0)
+		return NULL;
 
 	utf8proc_case_fold(&normalized, ref->data, ref->len);
 	strbuf_trim(&normalized);
 	strbuf_normalize_whitespace(&normalized);
 
-	return strbuf_detach(&normalized);
+	result = strbuf_detach(&normalized);
+	assert(result);
+
+	if (result[0] == '\0') {
+		free(result);
+		return NULL;
+	}
+	
+	return result;
 }
 
 static void add_reference(reference_map *map, reference* ref)
@@ -51,19 +65,23 @@ static void add_reference(reference_map *map, reference* ref)
 	map->table[ref->hash % REFMAP_SIZE] = ref;
 }
 
-extern reference *reference_create(reference_map *map, chunk *label, chunk *url, chunk *title)
+extern void reference_create(reference_map *map, chunk *label, chunk *url, chunk *title)
 {
 	reference *ref;
+	unsigned char *reflabel = normalize_reference(label);
+
+	/* empty reference name, or composed from only whitespace */
+	if (reflabel == NULL)
+		return;
+
 	ref = malloc(sizeof(reference));
-	ref->label = normalize_reference(label);
+	ref->label = reflabel;
 	ref->hash = refhash(ref->label);
 	ref->url = clean_url(url);
 	ref->title = clean_title(title);
 	ref->next = NULL;
 
 	add_reference(map, ref);
-
-	return ref;
 }
 
 // Returns reference if refmap contains a reference with matching
@@ -78,6 +96,9 @@ reference* reference_lookup(reference_map *map, chunk *label)
 		return NULL;
 	
 	norm = normalize_reference(label);
+	if (norm == NULL)
+		return NULL;
+
 	hash = refhash(norm);
 	ref = map->table[hash % REFMAP_SIZE];
 
diff --git a/src/references.h b/src/references.h
index 78fffe7..28937f1 100644
--- a/src/references.h
+++ b/src/references.h
@@ -22,6 +22,6 @@ typedef struct reference_map reference_map;
 reference_map *reference_map_new(void);
 void reference_map_free(reference_map *map);
 reference* reference_lookup(reference_map *map, chunk *label);
-extern reference *reference_create(reference_map *map, chunk *label, chunk *url, chunk *title);
+extern void reference_create(reference_map *map, chunk *label, chunk *url, chunk *title);
 
 #endif
-- 
cgit v1.2.3