tweak how errors are handled with custom data functions.

Yqnn · Jun 5, 2015 · c0f3b86 · c0f3b86
1 parent 1138d5f
commit c0f3b86
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/lib/core.js b/lib/core.js
@@ -397,8 +397,15 @@ Archiver.prototype.bulk = function(mappings) {
       }
 
       try {
-        entryData = dataFunction(entryData) || entryData;
-      } catch(e) {}
+        entryData = dataFunction ? dataFunction(entryData) : entryData;
+
+        if (dataFunction && typeof entryData !== 'object') {
+          throw new Error('bulk: invalid data returned from custom function');
+        }
+      } catch(e) {
+        self.emit('error', e);
+        return;
+      }
 
       self._append(filepath, entryData);
     });
@@ -446,8 +453,15 @@ Archiver.prototype.directory = function(dirpath, destpath, data) {
         entryData.stats = file.stats;
 
         try {
-          entryData = dataFunction(entryData) || entryData;
-        } catch(e) {}
+          entryData = dataFunction ? dataFunction(entryData) : entryData;
+
+          if (dataFunction && typeof entryData !== 'object') {
+            throw new Error('directory: invalid data returned from custom function');
+          }
+        } catch(e) {
+          self.emit('error', e);
+          return;
+        }
 
         self._append(file.path, entryData);
       });