Merge pull request #214 from kiwix/cyrillemoureaux-fix-self-redirect

Detect and reject infinite redirect loops.
This commit is contained in:
Matthieu Gautier 2019-04-15 17:01:43 +02:00 committed by GitHub
commit ec4525fd47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -122,7 +122,6 @@ Entry Entry::getFinalEntry() const
if (final_article.good()) {
return final_article;
}
int loopCounter = 42;
final_article = article;
while (final_article.isRedirect() && loopCounter--) {
@ -131,7 +130,10 @@ Entry Entry::getFinalEntry() const
throw NoEntry();
}
}
// Prevent infinite loops.
if (final_article.isRedirect()) {
throw NoEntry();
}
return final_article;
}