X Strike Force XFree86 SVN commit: r1772 - trunk/debian
Author: branden
Date: 2004-08-30 17:11:30 -0500 (Mon, 30 Aug 2004)
New Revision: 1772
Modified:
trunk/debian/CHANGESETS
trunk/debian/xserver-xfree86.config.in
Log:
Match end-of-line in validate_monitor_frequency_db_input(), so the user
can't insert arbitrary garbage after stuff that is syntactically valid and
have it sneak through. Thanks to Denis Barbier for pointing this out.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-30 20:07:58 UTC (rev 1771)
+++ trunk/debian/CHANGESETS 2004-08-30 22:11:30 UTC (rev 1772)
@@ -492,6 +492,6 @@
Make xserver-xfree86 config script's validate_monitor_frequency_db_input()
function more strict, so it doesn't regard open-ended ranges like "40-" as
valid.
- 1766, 1769
+ 1766, 1769, 1772
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2004-08-30 20:07:58 UTC (rev 1771)
+++ trunk/debian/xserver-xfree86.config.in 2004-08-30 22:11:30 UTC (rev 1772)
@@ -276,10 +276,10 @@
db_get "$TEMPLATE"
# This is a string, and needs input validation; a regex match will have to
# do. We force the first character to be a number to avoid hideous problems
- # in the debconf dialog frontend in 0.3.83 (it needs to be one anyway).
- # We don't allow values less than 10.
+ # in the debconf dialog frontend in 0.3.83 (it needs to be one anyway). We
+ # don't allow values less than 10.
if echo "$RET" | grep -qE \
- '^[0-9]{2,3}(\.[0-9]+)?(-[0-9]{2,3}(\.[0-9]+)?)?'; then
+ '^[0-9]{2,3}(\.[0-9]+)?(-[0-9]{2,3}(\.[0-9]+)?)?$'; then
break # valid input
fi
# we only get to this point if the input was invalid; restore the known
Reply to: