Do not segfault when unescaping empty links

aroben · Apr 27, 2011 · 1d84ecc · 1d84ecc
1 parent 8f0988a
commit 1d84ecc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/render/xhtml.c b/render/xhtml.c
@@ -64,15 +64,12 @@ uri_escape(struct buf *ob, const char *src, size_t size)
 		}
 
 		switch (c) {
-			case ';':
-			case '/':
-			case '?':
-			case ':':
-			case '@':
-			case '=':
-			case '#':
-			case '&':
-			case '.':
+			case ';': case '/':
+			case '?': case ':':
+			case '@': case '=':
+			case '#': case '&':
+			case '.': case '+':
+			case '-':
 				bufputc(ob, c);
 				continue;
 		}

diff --git a/src/markdown.c b/src/markdown.c
@@ -687,7 +687,7 @@ char_autolink(struct buf *ob, struct render *rndr, char *data, size_t offset, si
 		struct buf *u_link = rndr_newbuf(rndr);
 		unscape_text(u_link, &work);
 
-		rndr->make.autolink(ob, &work, MKDA_NORMAL, rndr->make.opaque);
+		rndr->make.autolink(ob, u_link, MKDA_NORMAL, rndr->make.opaque);
 		rndr_popbuf(rndr);
 	}
 
@@ -895,8 +895,10 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		else parse_inline(content, rndr, data + 1, txt_e - 1);
 	}
 
-	u_link = rndr_newbuf(rndr);
-	unscape_text(u_link, link);
+	if (link) {
+		u_link = rndr_newbuf(rndr);
+		unscape_text(u_link, link);
+	}
 
 	/* calling the relevant rendering function */
 	if (is_img) {