From 37924e441a3c0432088d3c33f544c8c7cefc92eb Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Mon, 16 Feb 2015 09:01:30 +0100
Subject: [PATCH] add try-catch clause around calls to applyToAText

---
 src/node/utils/padDiff.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/node/utils/padDiff.js b/src/node/utils/padDiff.js
index 88fa5cbad..24d5bb0c2 100644
--- a/src/node/utils/padDiff.js
+++ b/src/node/utils/padDiff.js
@@ -101,8 +101,12 @@ PadDiff.prototype._createClearStartAtext = function(rev, callback){
        return callback(err);
      }
    
+     try {
      //apply the clearAuthorship changeset
      var newAText = Changeset.applyToAText(changeset, atext, self._pad.pool);
+     } catch(err) {
+      return callback(err)
+     }
      
      callback(null, newAText);
    });
@@ -209,10 +213,14 @@ PadDiff.prototype._createDiffAtext = function(callback) {
         if(superChangeset){
           var deletionChangeset = self._createDeletionChangeset(superChangeset,atext,self._pad.pool);
         
-          //apply the superChangeset, which includes all addings
-          atext = Changeset.applyToAText(superChangeset,atext,self._pad.pool);
-          //apply the deletionChangeset, which adds a deletions
-          atext = Changeset.applyToAText(deletionChangeset,atext,self._pad.pool);
+          try {
+            //apply the superChangeset, which includes all addings
+            atext = Changeset.applyToAText(superChangeset,atext,self._pad.pool);
+            //apply the deletionChangeset, which adds a deletions
+            atext = Changeset.applyToAText(deletionChangeset,atext,self._pad.pool);
+          } catch(err) {
+           return callback(err)
+          }
         }      
  
         callback(err, atext);