← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2008-01-18 17:42:01 UTC
  • Revision ID: james.westby@ubuntu.com-20080118174201-iln6sizn5wvcbxvp
Tags: 1:1.0.2-0ubuntu10.9
https://launchpad.net/bugs/183969
Revert previous security update since it causes severe regressions.
(LP: #183969)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix_CVE-2007-5958.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## fix_CVE-2007-5958.dpatch by Kees Cook <kees@ubuntu.com>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad xorg-server-1.0.2~/Xext/security.c xorg-server-1.0.2/Xext/security.c
9
 
--- xorg-server-1.0.2~/Xext/security.c  2005-07-03 00:01:04.000000000 -0700
10
 
+++ xorg-server-1.0.2/Xext/security.c   2008-01-17 11:27:31.000000000 -0800
11
 
@@ -1647,9 +1647,9 @@
12
 
        return;
13
 
 
14
 
 #ifndef __UNIXOS2__
15
 
-    f = fopen(SecurityPolicyFile, "r");
16
 
+    f = Fopen(SecurityPolicyFile, "r");
17
 
 #else
18
 
-    f = fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r");
19
 
+    f = Fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r");
20
 
 #endif    
21
 
     if (!f)
22
 
     {
23
 
@@ -1733,7 +1733,7 @@
24
 
     }
25
 
 #endif /* PROPDEBUG */
26
 
 
27
 
-    fclose(f);
28
 
+    Fclose(f);
29
 
 } /* SecurityLoadPropertyAccessList */
30
 
 
31