Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

wrap lwip.open in try catch, it throws on unknow types, closes #3632

Browse Source
This commit is contained in:
barisusakli
2015-09-18 09:42:09 -04:00
parent 9ff3be67db
commit a14810a2e0
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/image.js
View File

@@ -17,7 +17,7 @@ image.resizeImage = function(path, extension, width, height, callback) {
callback(err); callback(err);
}); });
} else { } else {
lwip.open(path, function(err, image) { tryOpen(path, function(err, image) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -41,7 +41,7 @@ image.normalise = function(path, extension, callback) {
callback(err); callback(err);
}); });
} else { } else {
lwip.open(path, function(err, image) { tryOpen(path, function(err, image) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -50,6 +50,14 @@ image.normalise = function(path, extension, callback) {
} }
}; };
function tryOpen(path, callback) {
try {
lwip.open(path, callback);
} catch (err) {
callback(err);
}
}
image.convertImageToBase64 = function(path, callback) { image.convertImageToBase64 = function(path, callback) {
fs.readFile(path, function(err, data) { fs.readFile(path, function(err, data) {
callback(err, data ? data.toString('base64') : null); callback(err, data ? data.toString('base64') : null);