Add test and fix bug

Author: methane

markupsafe/_speedups.c

@@ -88,7 +88,7 @@ escape_unicode(PyObject *in)
 		next_escp = inp;
 		while (next_escp < inp_end) {
 			if (*next_escp < ESCAPED_CHARS_TABLE_SIZE &&
-                (delta_len = escaped_chars_delta_len[*next_escp])) {
+			    (delta_len = escaped_chars_delta_len[*next_escp])) {
 				++delta_len;
 				break;
 			}
@@ -133,7 +133,7 @@ escape_unicode(PyObject *in)
 	{  \
 		Py_ssize_t ncopy = 0;  \
 		while (inp < inp_end) {  \
-			switch (*inp++) {  \
+			switch (*inp) {  \
 			case '"':  \
 				memcpy(outp, inp-ncopy, sizeof(*outp)*ncopy); \
 				outp += ncopy; ncopy = 0; \
@@ -180,6 +180,7 @@ escape_unicode(PyObject *in)
 			default:  \
 				ncopy++; \
 			}  \
+            inp++; \
 		}  \
 		memcpy(outp, inp-ncopy, sizeof(*outp)*ncopy); \
 	}
@@ -297,7 +298,7 @@ escape(PyObject *self, PyObject *text)
 
 	if (!id__html__) {
 #if PY_MAJOR_VERSION < 3
-		id__html__ = PyStr_FromString("__html__");
+		id__html__ = PyString_FromString("__html__");
 #else
 		id__html__ = PyUnicode_FromString("__html__");
 #endif

tests.py

@@ -5,6 +5,12 @@
 import unittest
 from markupsafe import Markup, escape, escape_silent
 from markupsafe._compat import text_type, PY2
+from markupsafe import _native
+try:
+    from markupsafe import _speedups
+    have_speedups = True
+except ImportError:
+    have_speedups = False
 
 
 class MarkupTestCase(unittest.TestCase):
@@ -191,6 +197,51 @@ def test_markup_leaks(self):
             'leak objects, got: ' + str(len(counts))
 
 
+class NativeEscapeTestCase(unittest.TestCase):
+
+    escape = staticmethod(_native.escape)
+
+    def test_empty(self):
+        self.assertEqual(Markup(u''), self.escape(u''))
+
+    def test_ascii(self):
+        self.assertEqual(
+                Markup(u'abcd&><'"efgh'),
+                self.escape(u'abcd&><\'"efgh'))
+        self.assertEqual(
+                Markup(u'&amp;&gt;&lt;&#39;&#34;efgh'),
+                self.escape(u'&><\'"efgh'))
+        self.assertEqual(
+                Markup(u'abcd&amp;&gt;&lt;&#39;&#34;'),
+                self.escape(u'abcd&><\'"'))
+
+    def test_2byte(self):
+        self.assertEqual(
+                Markup(u'こんにちは&amp;&gt;&lt;&#39;&#34;こんばんは'),
+                self.escape(u'こんにちは&><\'"こんばんは'))
+        self.assertEqual(
+                Markup(u'&amp;&gt;&lt;&#39;&#34;こんばんは'),
+                self.escape(u'&><\'"こんばんは'))
+        self.assertEqual(
+                Markup(u'こんにちは&amp;&gt;&lt;&#39;&#34;'),
+                self.escape(u'こんにちは&><\'"'))
+
+    def test_4byte(self):
+        self.assertEqual(
+                Markup(u'\U0001F363\U0001F362&amp;&gt;&lt;&#39;&#34;\U0001F37A xyz'),
+                self.escape(u'\U0001F363\U0001F362&><\'"\U0001F37A xyz'))
+        self.assertEqual(
+                Markup(u'&amp;&gt;&lt;&#39;&#34;\U0001F37A xyz'),
+                self.escape(u'&><\'"\U0001F37A xyz'))
+        self.assertEqual(
+                Markup(u'\U0001F363\U0001F362&amp;&gt;&lt;&#39;&#34;'),
+                self.escape(u'\U0001F363\U0001F362&><\'"'))
+
+if have_speedups:
+    class SpeedupEscapeTestCase(NativeEscapeTestCase):
+        escape = _speedups.escape
+
+
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(MarkupTestCase))
@@ -199,6 +250,10 @@ def suite():
     if not hasattr(escape, 'func_code'):
         suite.addTest(unittest.makeSuite(MarkupLeakTestCase))
 
+    suite.addTest(unittest.makeSuite(NativeEscapeTestCase))
+    if have_speedups:
+        suite.addTest(unittest.makeSuite(SpeedupEscapeTestCase))
+
     return suite