Escape markdown image alt text and src

2 files changed, 15 insertions, 3 deletions

diff --git a/lib/writers/markdown-writer.js b/lib/writers/markdown-writer.js
index 02961fe..399acac 100644
--- a/lib/writers/markdown-writer.js
+++ b/lib/writers/markdown-writer.js
@@ -29,7 +29,7 @@ function markdownImage(attributes) {
     var src = attributes.src || "";
     var altText = attributes.alt || "";
     if (src || altText) {
-        return {start: "![" + altText + "](" + src + ")"};
+        return {start: "![" + escapeMarkdown(altText) + "](" + escapeMarkdown(src) + ")"};
     } else {
         return {};
     }
diff --git a/test/writers/markdown-writer.tests.js b/test/writers/markdown-writer.tests.js
index d66cc79..578e6ff 100644
--- a/test/writers/markdown-writer.tests.js
+++ b/test/writers/markdown-writer.tests.js
@@ -117,13 +117,25 @@ test('links have anchors before opening square bracket', function() {
 test('can generate images', function() {
     var writer = mdWriter.writer();
     writer.selfClosing("img", {"src": "http://example.com/image.jpg", "alt": "Alt Text"});
-    return assert.equal(writer.asString(), "![Alt Text](http://example.com/image.jpg)");
+    return assert.equal(writer.asString(), "![Alt Text](http://example\\.com/image\\.jpg)");
+});
+
+test('image alt text is escaped', function() {
+    var writer = mdWriter.writer();
+    writer.selfClosing("img", {"src": "http://example.com/image.jpg", "alt": "Alt Text]Oops"});
+    return assert.equal(writer.asString(), "![Alt Text\\]Oops](http://example\\.com/image\\.jpg)");
+});
+
+test('image src is escaped', function() {
+    var writer = mdWriter.writer();
+    writer.selfClosing("img", {"src": "http://example.com/image.jpg)Oops", "alt": "Alt Text"});
+    return assert.equal(writer.asString(), "![Alt Text](http://example\\.com/image\\.jpg\\)Oops)");
 });
 
 test('can generate images with missing alt attribute', function() {
     var writer = mdWriter.writer();
     writer.selfClosing("img", {"src": "http://example.com/image.jpg"});
-    return assert.equal(writer.asString(), "![](http://example.com/image.jpg)");
+    return assert.equal(writer.asString(), "![](http://example\\.com/image\\.jpg)");
 });
 
 test('can generate images with missing src attribute', function() {