← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/xorg-server/gutsy-security

« back to all changes in this revision

Viewing changes to debian/patches/fix_CVE-2007-5958.patch

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2008-01-18 11:59:21 UTC
  • Revision ID: james.westby@ubuntu.com-20080118115921-424xvsojfomp8g3x
Tags: 2:1.3.0.0.dfsg-12ubuntu8.3
* SECURITY UPDATE: multiple memory corruption flaws.
* Re-applied security patches from 2:1.3.0.0.dfsg-12ubuntu8.1.
* Updated fix_CVE-2007-6429.patch: upstream fixes for bbp < 8
  crash regressions.
* References
  http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=e9fa7c1c88a8130a48f772c92b186b8b777986b5

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix_CVE-2007-5958.patch
 
1
Index: xorg-server-1.3.0.0.dfsg/Xext/security.c
 
2
===================================================================
 
3
--- xorg-server-1.3.0.0.dfsg.orig/Xext/security.c       2008-01-17 11:21:30.000000000 -0800
 
4
+++ xorg-server-1.3.0.0.dfsg/Xext/security.c    2008-01-17 11:21:59.000000000 -0800
 
5
@@ -1567,9 +1567,9 @@
 
6
        return;
 
7
 
 
8
 #ifndef __UNIXOS2__
 
9
-    f = fopen(SecurityPolicyFile, "r");
 
10
+    f = Fopen(SecurityPolicyFile, "r");
 
11
 #else
 
12
-    f = fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r");
 
13
+    f = Fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r");
 
14
 #endif    
 
15
     if (!f)
 
16
     {
 
17
@@ -1653,7 +1653,7 @@
 
18
     }
 
19
 #endif /* PROPDEBUG */
 
20
 
 
21
-    fclose(f);
 
22
+    Fclose(f);
 
23
 } /* SecurityLoadPropertyAccessList */
 
24
 
 
25