redcarpet 1.11.2 → 1.11.3

data/ext/markdown.c

@@ -145,6 +145,26 @@ is_safe_link(const char *link, size_t link_len)
 	return 0;
 }
 
+static void
+unscape_text(struct buf *ob, struct buf *src)
+{
+	size_t i = 0, org;
+	while (i < src->size) {
+		org = i;
+		while (i < src->size && src->data[i] != '\\')
+			i++;
+
+		if (i > org)
+			bufput(ob, src->data + org, i - org);
+
+		if (i + 1 >= src->size)
+			break;
+
+		bufputc(ob, src->data[i + 1]);
+		i += 2;
+	}
+}
+
 /* cmp_link_ref • comparison function for link_ref sorted arrays */
 static int
 cmp_link_ref(void *key, void *array_entry)
@@ -253,14 +273,19 @@ tag_length(char *data, size_t size, enum mkd_autolink *autolink)
 	}
 
 	/* completing autolink test: no whitespace or ' or " */
-	if (i >= size || i == '>')
+	if (i >= size)
 		*autolink = MKDA_NOT_AUTOLINK;
+
 	else if (*autolink) {
 		j = i;
-		while (i < size && data[i] != '>' && data[i] != '\''
-		&& data[i] != '"' && data[i] != ' ' && data[i] != '\t'
-		&& data[i] != '\t')
-			i += 1;
+
+		while (i < size) {
+			if (data[i] == '\\') i += 2;
+			else if (data[i] == '>' || data[i] == '\'' ||
+					data[i] == '"' || isspace(data[i])) break;
+			else i += 1;
+		}
+
 		if (i >= size) return 0;
 		if (i > j && data[i] == '>') return i + 1;
 		/* one of the forbidden chars has been found */
@@ -629,9 +654,12 @@ char_langle_tag(struct buf *ob, struct render *rndr, char *data, size_t offset,
 
 	if (end > 2) {
 		if (rndr->make.autolink && altype != MKDA_NOT_AUTOLINK) {
+			struct buf *u_link = rndr_newbuf(rndr);
 			work.data = data + 1;
 			work.size = end - 2;
-			ret = rndr->make.autolink(ob, &work, altype, rndr->make.opaque);
+			unscape_text(u_link, &work);
+			ret = rndr->make.autolink(ob, u_link, altype, rndr->make.opaque);
+			rndr_popbuf(rndr);
 		}
 		else if (rndr->make.raw_html_tag)
 			ret = rndr->make.raw_html_tag(ob, &work, rndr->make.opaque);
@@ -655,8 +683,13 @@ char_autolink(struct buf *ob, struct render *rndr, char *data, size_t offset, si
 	while (work.size < size && !isspace(data[work.size]))
 		work.size++;
 
-	if (rndr->make.autolink)
-		rndr->make.autolink(ob, &work, MKDA_NORMAL, rndr->make.opaque);
+	if (rndr->make.autolink) {
+		struct buf *u_link = rndr_newbuf(rndr);
+		unscape_text(u_link, &work);
+
+		rndr->make.autolink(ob, u_link, MKDA_NORMAL, rndr->make.opaque);
+		rndr_popbuf(rndr);
+	}
 
 	return work.size;
 }
@@ -670,6 +703,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 	struct buf *content = 0;
 	struct buf *link = 0;
 	struct buf *title = 0;
+	struct buf *u_link = 0;
 	size_t org_work_size = rndr->work.size;
 	int text_has_nl = 0, ret = 0;
 
@@ -717,9 +751,11 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		link_b = i;
 
 		/* looking for link end: ' " ) */
-		while (i < size && data[i] != '\'' && data[i] != '"' &&
-				(data[i] != ')' || data[i - 1] == '\\'))
-			i++;
+		while (i < size) {
+			if (data[i] == '\\') i += 2;
+			else if (data[i] == ')' || data[i] == '\'' || data[i] == '"') break;
+			else i += 1;
+		}
 
 		if (i >= size) goto cleanup;
 		link_e = i;
@@ -729,7 +765,12 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 			i++;
 			title_b = i;
 
-			while (i < size && (data[i] != ')' || data[i - 1] == '\\')) i++;
+			while (i < size) {
+				if (data[i] == '\\') i += 2;
+				else if (data[i] == ')') break;
+				else i += 1;
+			}
+
 			if (i >= size) goto cleanup;
 
 			/* skipping whitespaces after title */
@@ -854,14 +895,20 @@ 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);
 	}
 
+	if (link) {
+		u_link = rndr_newbuf(rndr);
+		unscape_text(u_link, link);
+	}
+
 	/* calling the relevant rendering function */
 	if (is_img) {
 		if (ob->size && ob->data[ob->size - 1] == '!')
 			ob->size -= 1;
 
-		ret = rndr->make.image(ob, link, title, content, rndr->make.opaque);
-	} else
-		ret = rndr->make.link(ob, link, title, content, rndr->make.opaque);
+		ret = rndr->make.image(ob, u_link, title, content, rndr->make.opaque);
+	} else {
+		ret = rndr->make.link(ob, u_link, title, content, rndr->make.opaque);
+	}
 
 	/* cleanup */
 cleanup:

data/ext/xhtml.c

@@ -49,9 +49,41 @@ put_scaped_char(struct buf *ob, char c)
 	}
 }
 
-/* lus_attr_escape • copy the buffer entity-escaping '<', '>', '&' and '"' */
 static void
-lus_attr_escape(struct buf *ob, const char *src, size_t size)
+uri_escape(struct buf *ob, const char *src, size_t size)
+{
+	size_t i;
+
+	for (i = 0; i < size; ++i) {
+		char c = src[i];
+
+		if (c == '%' && i + 2 < size && isxdigit(src[i + 1]) && isxdigit(src[i + 2])) {
+			bufput(ob, src + i, 3);
+			i += 2;
+			continue;
+		}
+
+		switch (c) {
+			case ';': case '/':
+			case '?': case ':':
+			case '@': case '=':
+			case '#': case '&':
+			case '.': case '+':
+			case '-':
+				bufputc(ob, c);
+				continue;
+		}
+
+		if (!isalnum(c))
+			bufprintf(ob, "%%%02x", (int)c);
+		else
+			bufputc(ob, c);
+	}
+}
+
+/* attr_escape • copy the buffer entity-escaping '<', '>', '&' and '"' */
+static void
+attr_escape(struct buf *ob, const char *src, size_t size)
 {
 	size_t  i = 0, org;
 	while (i < size) {
@@ -122,7 +154,7 @@ rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *op
 	BUFPUTSL(ob, "<a href=\"");
 	if (type == MKDA_EMAIL)
 		BUFPUTSL(ob, "mailto:");
-	bufput(ob, link->data, link->size);
+	uri_escape(ob, link->data, link->size);
 	BUFPUTSL(ob, "\">");
 
 	/*
@@ -131,9 +163,9 @@ rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *op
 	 * want to print the `mailto:` prefix
 	 */
 	if (bufprefix(link, "mailto:") == 0) {
-		lus_attr_escape(ob, link->data + 7, link->size - 7);
+		attr_escape(ob, link->data + 7, link->size - 7);
 	} else {
-		lus_attr_escape(ob, link->data, link->size);
+		attr_escape(ob, link->data, link->size);
 	}
 
 	BUFPUTSL(ob, "</a>");
@@ -162,7 +194,7 @@ rndr_blockcode(struct buf *ob, struct buf *text, struct buf *lang, void *opaque)
 		BUFPUTSL(ob, "<pre><code>");
 
 	if (text)
-		lus_attr_escape(ob, text->data, text->size);
+		attr_escape(ob, text->data, text->size);
 
 	BUFPUTSL(ob, "</code></pre>\n");
 }
@@ -208,7 +240,7 @@ rndr_blockcode_github(struct buf *ob, struct buf *text, struct buf *lang, void *
 		BUFPUTSL(ob, "<pre><code>");
 
 	if (text)
-		lus_attr_escape(ob, text->data, text->size);
+		attr_escape(ob, text->data, text->size);
 
 	BUFPUTSL(ob, "</code></pre>\n");
 }
@@ -225,7 +257,7 @@ static int
 rndr_codespan(struct buf *ob, struct buf *text, void *opaque)
 {
 	BUFPUTSL(ob, "<code>");
-	if (text) lus_attr_escape(ob, text->data, text->size);
+	if (text) attr_escape(ob, text->data, text->size);
 	BUFPUTSL(ob, "</code>");
 	return 1;
 }
@@ -291,10 +323,10 @@ rndr_link(struct buf *ob, struct buf *link, struct buf *title, struct buf *conte
 		return 0;
 
 	BUFPUTSL(ob, "<a href=\"");
-	if (link && link->size) lus_attr_escape(ob, link->data, link->size);
+	if (link && link->size) uri_escape(ob, link->data, link->size);
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
-		lus_attr_escape(ob, title->data, title->size); }
+		attr_escape(ob, title->data, title->size); }
 	BUFPUTSL(ob, "\">");
 	if (content && content->size) bufput(ob, content->data, content->size);
 	BUFPUTSL(ob, "</a>");
@@ -406,13 +438,13 @@ rndr_image(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt,
 {
 	if (!link || !link->size) return 0;
 	BUFPUTSL(ob, "<img src=\"");
-	lus_attr_escape(ob, link->data, link->size);
+	attr_escape(ob, link->data, link->size);
 	BUFPUTSL(ob, "\" alt=\"");
 	if (alt && alt->size)
-		lus_attr_escape(ob, alt->data, alt->size);
+		attr_escape(ob, alt->data, alt->size);
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
-		lus_attr_escape(ob, title->data, title->size); }
+		attr_escape(ob, title->data, title->size); }
 	BUFPUTSL(ob, "\" />");
 	return 1;
 }
@@ -444,7 +476,7 @@ rndr_raw_html(struct buf *ob, struct buf *text, void *opaque)
 
 
 	if (escape_html)
-		lus_attr_escape(ob, text->data, text->size);
+		attr_escape(ob, text->data, text->size);
 	else
 		bufput(ob, text->data, text->size);
 
@@ -591,7 +623,7 @@ static void
 rndr_normal_text(struct buf *ob, struct buf *text, void *opaque)
 {
 	if (text)
-		lus_attr_escape(ob, text->data, text->size);
+		attr_escape(ob, text->data, text->size);
 }
 
 static void

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.11.2'
+  VERSION = '1.11.3'
 
   # Original Markdown formatted text.
   attr_reader :text

data/redcarpet.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.11.2'
+  s.version = '1.11.3'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-04-26'
+  s.date = '2011-04-27'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.has_rdoc = true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 1
   - 11
-  - 2
-  version: 1.11.2
+  - 3
+  version: 1.11.3
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 +03:00
+date: 2011-04-27 00:00:00 +03:00
 default_executable: 
 dependencies: []