Parse array/objects inside attributes safely

GrapesJS · Oct 17, 2017 · 0efe3b2 · 0efe3b2
1 parent 73f4183
commit 0efe3b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/dist/grapes.min.js b/dist/grapes.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grapesjs",
   "description": "Free and Open Source Web Builder Framework",
-  "version": "0.12.9",
+  "version": "0.12.14",
   "author": "Artur Arseniev",
   "license": "BSD-3-Clause",
   "homepage": "http://grapesjs.com",

diff --git a/src/parser/model/ParserHtml.js b/src/parser/model/ParserHtml.js
@@ -114,8 +114,13 @@ module.exports = config => {
             const lastChar = nodeValue && nodeValue.substr(valueLen - 1);
             nodeValue = nodeValue === 'true' ? true : nodeValue;
             nodeValue = nodeValue === 'false' ? false : nodeValue;
-            nodeValue = (firstChar == '{' && lastChar == '}') ||
-              (firstChar == '[' && lastChar == ']') ? JSON.parse(nodeValue) : nodeValue;
+            // Try to json parse where is possible
+            // I can get false positive here (eg. a selector '[data-attr]')
+            // so put it under try/catch and let fail silently
+            try {
+              nodeValue = (firstChar == '{' && lastChar == '}') ||
+                (firstChar == '[' && lastChar == ']') ? JSON.parse(nodeValue) : nodeValue;
+            } catch (e) {}
             model[modelAttr] = nodeValue;
           } else {
             model.attributes[nodeName] = nodeValue;

diff --git a/test/specs/parser/model/ParserHtml.js b/test/specs/parser/model/ParserHtml.js
@@ -5,7 +5,7 @@ const DomComponents = require('dom_components');
 module.exports = {
   run() {
 
-    describe.only('ParserHtml', () => {
+    describe('ParserHtml', () => {
       var obj;
 
       beforeEach(() => {