[PATCH stable] hgweb: ignore non numeric "revcount" parameter values (issue4091)
Isaac Jurado
diptongo at gmail.com
Fri Nov 8 08:48:12 UTC 2013
# HG changeset patch
# User Isaac Jurado <diptongo at gmail.com>
# Date 1383900481 -3600
# Fri Nov 08 09:48:01 2013 +0100
# Branch stable
# Node ID b0666e2272d4cdd6792767c6ff96687dfa2aa097
# Parent d825e4025e39d1c39db943cdc89818abd0a87c27
hgweb: ignore non numeric "revcount" parameter values (issue4091)
diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -228,9 +228,12 @@
query = req.form['rev'][0]
revcount = web.maxchanges
if 'revcount' in req.form:
- revcount = int(req.form.get('revcount', [revcount])[0])
- revcount = max(revcount, 1)
- tmpl.defaults['sessionvars']['revcount'] = revcount
+ try:
+ revcount = int(req.form.get('revcount', [revcount])[0])
+ revcount = max(revcount, 1)
+ tmpl.defaults['sessionvars']['revcount'] = revcount
+ except ValueError:
+ pass
lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount / 2, 1)
@@ -307,9 +310,12 @@
revcount = shortlog and web.maxshortchanges or web.maxchanges
if 'revcount' in req.form:
- revcount = int(req.form.get('revcount', [revcount])[0])
- revcount = max(revcount, 1)
- tmpl.defaults['sessionvars']['revcount'] = revcount
+ try:
+ revcount = int(req.form.get('revcount', [revcount])[0])
+ revcount = max(revcount, 1)
+ tmpl.defaults['sessionvars']['revcount'] = revcount
+ except ValueError:
+ pass
lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount / 2, 1)
@@ -822,9 +828,12 @@
revcount = web.maxshortchanges
if 'revcount' in req.form:
- revcount = int(req.form.get('revcount', [revcount])[0])
- revcount = max(revcount, 1)
- tmpl.defaults['sessionvars']['revcount'] = revcount
+ try:
+ revcount = int(req.form.get('revcount', [revcount])[0])
+ revcount = max(revcount, 1)
+ tmpl.defaults['sessionvars']['revcount'] = revcount
+ except ValueError:
+ pass
lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount / 2, 1)
@@ -945,9 +954,12 @@
bg_height = 39
revcount = web.maxshortchanges
if 'revcount' in req.form:
- revcount = int(req.form.get('revcount', [revcount])[0])
- revcount = max(revcount, 1)
- tmpl.defaults['sessionvars']['revcount'] = revcount
+ try:
+ revcount = int(req.form.get('revcount', [revcount])[0])
+ revcount = max(revcount, 1)
+ tmpl.defaults['sessionvars']['revcount'] = revcount
+ except ValueError:
+ pass
lessvars = copy.copy(tmpl.defaults['sessionvars'])
lessvars['revcount'] = max(revcount / 2, 1)
More information about the Mercurial-devel
mailing list