OSSForks/express
1
0
Fork 0
mirror of https://github.com/zebrajr/express.git synced 2025-12-06 12:19:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix infinite loop condition using mergeParams: true

Browse Source
This commit is contained in:
Douglas Christopher Wilson 2015-08-03 00:50:48 -04:00
parent 97b2d70d8a
commit ee90042d0c
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
History.md
View File

@ -1,3 +1,8 @@
unreleased
==========
* Fix infinite loop condition using `mergeParams: true`
4.13.2 / 2015-07-31
===================

9
lib/router/index.js
View File

@ -578,9 +578,12 @@ function mergeParams(params, parent) {
var o = 0;
// determine numeric gaps
while (i === o || o in parent) {
if (i in params) i++;
if (o in parent) o++;
while (i in params) {
i++;
}
while (o in parent) {
o++;
}
// offset numeric indices in params before merge

16
test/app.router.js
View File

@ -320,6 +320,22 @@ describe('app.router', function(){
.expect(200, '[["0","10"],["1","tj"],["2","profile"]]', done);
})
it('should merge numeric indices req.params when parent has same number', function(done){
var app = express();
var router = new express.Router({ mergeParams: true });
router.get('/name:(\\w+)', function(req, res){
var keys = Object.keys(req.params).sort();
res.send(keys.map(function(k){ return [k, req.params[k]] }));
});
app.use('/user/id:(\\d+)', router);
request(app)
.get('/user/id:10/name:tj')
.expect(200, '[["0","10"],["1","tj"]]', done);
})
it('should ignore invalid incoming req.params', function(done){
var app = express();
var router = new express.Router({ mergeParams: true });