From 89d1c717b04fe527d342829ad245568822af3ca6 Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Mon, 15 Feb 2016 00:27:20 +0100
Subject: [PATCH] Handle errors from txt and html export correctly This
 addresses crashes with

Error: Not a exports: null
    at Object.exports.unpack
    at Object.exports.applyToText
    at Object.exports.applyToAText

and

Error: atext is null
    at Object.exports.cloneAText
---
 src/node/handler/ExportHandler.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js
index 8f91ced23..0f98c83f3 100644
--- a/src/node/handler/ExportHandler.js
+++ b/src/node/handler/ExportHandler.js
@@ -78,8 +78,13 @@ exports.doExport = function(req, res, padId, type)
       {
         exporttxt.getPadTXTDocument(padId, req.params.rev, false, function(err, txt)
         {
-          if(ERR(err)) return;
-          res.send(txt);
+          if (err) {
+            res.status(400);
+            res.send();
+            console.log("Could not process export request:",err.message);
+          } else {
+            res.send(txt);
+          }
         });
       }
       else
@@ -94,7 +99,12 @@ exports.doExport = function(req, res, padId, type)
           {
             exporthtml.getPadHTMLDocument(padId, req.params.rev, false, function(err, _html)
             {
-              if(ERR(err, callback)) return;
+              if (err) {
+                res.status(400);
+                res.send();
+                console.log("Could not process export request:",err.message);
+                return;
+              }
               html = _html;
               callback();
             });