More strict email autoliking

vmg · Jun 2, 2011 · 382d82f · 382d82f
1 parent 2d249cc
commit 382d82f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/ext/redcarpet/markdown.c b/ext/redcarpet/markdown.c
@@ -878,7 +878,7 @@ char_autolink_email(struct buf *ob, struct render *rndr, char *data, size_t offs
 		if (isalnum(c))
 			continue;
 
-		if (strchr(".!#$%&*+-/=?^_`|~", c) != NULL)
+		if (strchr(".+-_", c) != NULL)
 			continue;
 
 		break;
@@ -895,7 +895,7 @@ char_autolink_email(struct buf *ob, struct render *rndr, char *data, size_t offs
 
 		if (c == '@')
 			nb++;
-		else if (c == '.')
+		else if (c == '.' && link_end < size - 1)
 			np++;
 		else if (c != '-' && c != '_')
 			break;

diff --git a/ext/redcarpet/markdown.h b/ext/redcarpet/markdown.h
@@ -21,10 +21,10 @@
 
 #include "buffer.h"
 
-#define UPSKIRT_VERSION "1.15.1"
+#define UPSKIRT_VERSION "1.15.2"
 #define UPSKIRT_VER_MAJOR 1
 #define UPSKIRT_VER_MINOR 15
-#define UPSKIRT_VER_REVISION 1
+#define UPSKIRT_VER_REVISION 2
 
 /********************
  * TYPE DEFINITIONS *

diff --git a/lib/redcarpet.rb b/lib/redcarpet.rb
@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.15.1'
+  VERSION = '1.15.2'
 
   # Original Markdown formatted text.
   attr_reader :text

diff --git a/redcarpet.gemspec b/redcarpet.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.15.1'
+  s.version = '1.15.2'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
   s.date = '2011-06-02'

diff --git a/upskirt b/upskirt