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

fix validator.js crashes

Browse Source
This commit is contained in:
barisusakli
2016-06-23 10:16:26 +03:00
parent 222b0f010c
commit 2342141e0f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/controllers/index.js
View File

@@ -199,7 +199,7 @@ Controllers.registerInterstitial = function(req, res, next) {
} }
var renders = data.interstitials.map(function(interstitial) { var renders = data.interstitials.map(function(interstitial) {
return async.apply(req.app.render.bind(req.app), interstitial.template, interstitial.data) return async.apply(req.app.render.bind(req.app), interstitial.template, interstitial.data);
}); });
var errors = req.flash('error'); var errors = req.flash('error');
@@ -410,12 +410,14 @@ Controllers.handle404 = function(req, res) {
meta.errors.log404(req.path.replace(/^\/api/, '') || ''); meta.errors.log404(req.path.replace(/^\/api/, '') || '');
res.status(404); res.status(404);
var path = String(req.path || '');
if (res.locals.isAPI) { if (res.locals.isAPI) {
return res.json({path: validator.escape(req.path.replace(/^\/api/, '') || ''), title: '[[global:404.title]]'}); return res.json({path: validator.escape(path.replace(/^\/api/, '')), title: '[[global:404.title]]'});
} }
req.app.locals.middleware.buildHeader(req, res, function() { req.app.locals.middleware.buildHeader(req, res, function() {
res.render('404', {path: validator.escape(req.path || ''), title: '[[global:404.title]]'}); res.render('404', {path: validator.escape(path), title: '[[global:404.title]]'});
}); });
} else { } else {
res.status(404).type('txt').send('Not found'); res.status(404).type('txt').send('Not found');
@@ -439,11 +441,12 @@ Controllers.handleErrors = function(err, req, res, next) {
res.status(err.status || 500); res.status(err.status || 500);
var path = String(req.path || '');
if (res.locals.isAPI) { if (res.locals.isAPI) {
res.json({path: validator.escape(req.path || ''), error: err.message}); res.json({path: validator.escape(path), error: err.message});
} else { } else {
req.app.locals.middleware.buildHeader(req, res, function() { req.app.locals.middleware.buildHeader(req, res, function() {
res.render('500', {path: validator.escape(String(req.path || '')), error: validator.escape(err.message)}); res.render('500', {path: validator.escape(path), error: validator.escape(String(err.message))});
}); });
} }
}; };