Improvements on parsing error handling.

glisteningly · Feb 28, 2016 · 0b23ff6 · 0b23ff6
1 parent 81e1ebe
commit 0b23ff6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/lib/svgo/svg2js.js b/lib/svgo/svg2js.js
@@ -25,7 +25,8 @@ module.exports = function(data, callback) {
         root = new JSAPI({ elem: '#document' }),
         current = root,
         stack = [root],
-        textContext = null;
+        textContext = null,
+        parsingError = false;
 
     function pushToContent(content) {
 
@@ -143,7 +144,9 @@ module.exports = function(data, callback) {
     sax.onerror = function(e) {
 
         e.message = 'Error in parsing SVG: ' + e.message;
-        throw e;
+        if (e.message.indexOf('Unexpected end') < 0) {
+            throw e;
+        }
 
     };
 
@@ -161,8 +164,9 @@ module.exports = function(data, callback) {
         sax.write(data);
     } catch (e) {
         callback({ error: e.message });
+        parsingError = true;
     }
-    sax.close();
+    if (!parsingError) sax.close();
 
     function trim(elem) {
         if (!elem.content) return elem;

diff --git a/test/svg2js/_index.js b/test/svg2js/_index.js
@@ -426,10 +426,10 @@ describe('svg2js', function() {
 
         });
 
-        describe('thrown error', function() {
+        describe('error', function() {
 
-            it('should be an instance of Error', function() {
-                return error.should.be.an.instanceOf(Error);
+            it('should not be thrown', function() {
+                return SHOULD.not.exist(error);
             });
 
         });