debian/changelog | 5 ++++-
debian/patches/series | 1 +
hw/xfree86/parser/scan.c | 9 +++++++++
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 949fae79e1b4fce2dc3f756650f68f519157d776
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Sun Mar 2 17:10:14 2008 -0500
* Add 11_dont_crash_on_bad_dri_mode. See bugzilla #13860
diff --git a/debian/changelog b/debian/changelog
index 5af71a3..0ed3d77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,10 @@ xorg-server (2:1.4.1~git20080131-2) UNRELEASED; urgency=low
(once again closes: #433131)
* Refresh all patches to make patch-audit happy.
- -- Drew Parsons <[EMAIL PROTECTED]> Mon, 25 Feb 2008 03:25:53 +1100
+ [ David Nusinow ]
+ * Add 11_dont_crash_on_bad_dri_mode. See bugzilla #13860
+
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 02 Mar 2008 10:02:40 -0500
xorg-server (2:1.4.1~git20080131-1) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index a90ab4a..085689a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@
07_autoconfig_screen_with_device_section.diff
08_better_dpms_logging.diff
10_dont_look_in_home_for_config.diff -p0
+11_dont_crash_on_bad_dri_mode.diff
13_debian_add_xkbpath_env_variable.diff
14_default_screen_section.diff
21_glx_align_fixes.patch
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index 55c7eb5..3e66685 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -379,11 +379,20 @@ again:
if (c == '0')
if ((configBuf[configPos] == 'x') ||
(configBuf[configPos] == 'X'))
+ {
base = 16;
+ val.numType = PARSE_HEX;
+ }
else
+ {
base = 8;
+ val.numType = PARSE_OCTAL;
+ }
else
+ {
base = 10;
+ val.numType = PARSE_DECIMAL;
+ }
configRBuf[0] = c;
i = 1;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
