Ensure JSON.parse() errors don't interrupt parsing HTML

Author: javan

src/trix/models/html_parser.coffee

@@ -111,7 +111,7 @@ class Trix.HTMLParser extends Trix.BasicObject
 
   processElement: (element) ->
     if nodeIsAttachmentElement(element)
-      attributes = getAttachmentAttributes(element)
+      attributes = parseTrixDataAttribute(element, "attachment")
       if Object.keys(attributes).length
         textAttributes = @getTextAttributes(element)
         @appendAttachmentWithAttributes(attributes, textAttributes)
@@ -212,9 +212,8 @@ class Trix.HTMLParser extends Trix.BasicObject
           attributes[attribute] = value
 
     if nodeIsAttachmentElement(element)
-      if json = element.getAttribute("data-trix-attributes")
-        for key, value of JSON.parse(json)
-          attributes[key] = value
+      for key, value of parseTrixDataAttribute(element, "attributes")
+        attributes[key] = value
 
     attributes
 
@@ -237,8 +236,11 @@ class Trix.HTMLParser extends Trix.BasicObject
       element = element.parentNode
     ancestors
 
-  getAttachmentAttributes = (element) ->
-    JSON.parse(element.getAttribute("data-trix-attachment"))
+  parseTrixDataAttribute = (element, name) ->
+    try
+     JSON.parse(element.getAttribute("data-trix-#{name}"))
+    catch
+      {}
 
   getImageDimensions = (element) ->
     width = element.getAttribute("width")

test/src/unit/html_parser_test.coffee

@@ -192,6 +192,17 @@ testGroup "Trix.HTMLParser", ->
     expectedHTML = """<div><!--block-->a b c</div>"""
     assert.documentHTMLEqual Trix.HTMLParser.parse(html).getDocument(), expectedHTML
 
+  test "ignores attachment elements with malformed JSON", ->
+    html = """
+    <div>a</div>\
+    <div data-trix-attachment data-trix-attributes></div>\
+    <div data-trix-attachment="" data-trix-attributes=""></div>\
+    <div data-trix-attachment="{&quot;x:}" data-trix-attributes="{&quot;x:}"></div>\
+    <div>b</div>
+    """
+    expectedHTML = """<div><!--block-->a</div><div><!--block--><br></div><div><!--block-->b</div>"""
+    assert.documentHTMLEqual Trix.HTMLParser.parse(html).getDocument(), expectedHTML
+
   test "parses attachment caption from large html string", (done) ->
     html = fixtures["image attachment with edited caption"].html