aboutsummaryrefslogtreecommitdiff
path: root/libXfont/src/fontfile/fileio.c
diff options
context:
space:
mode:
authorMike DePaulo <mikedep333@gmail.com>2015-05-09 20:15:27 -0400
committerMike DePaulo <mikedep333@gmail.com>2015-05-09 20:20:02 -0400
commitbec4be4c48239613ed1c704ae71bf08754eef711 (patch)
tree3bcc6202527e53611fd6f66ea147bda48e6e6b14 /libXfont/src/fontfile/fileio.c
parent13c50b4df1dc97026afb7c783378ade4929f24f1 (diff)
downloadvcxsrv-bec4be4c48239613ed1c704ae71bf08754eef711.tar.gz
vcxsrv-bec4be4c48239613ed1c704ae71bf08754eef711.tar.bz2
vcxsrv-bec4be4c48239613ed1c704ae71bf08754eef711.zip
Updated to libXfont 1.5.1
In addition to some other changes, the following CVEs have been fixed: bdfReadProperties: property count needs range check [CVE-2015-1802] bdfReadCharacters: bailout if a char's bitmap cannot be read [CVE-2015-1803] bdfReadCharacters: ensure metrics fit into xCharInfo struct [CVE-2015-1804]
Diffstat (limited to 'libXfont/src/fontfile/fileio.c')
-rw-r--r--libXfont/src/fontfile/fileio.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libXfont/src/fontfile/fileio.c b/libXfont/src/fontfile/fileio.c
index 80af51193..d44cecdc4 100644
--- a/libXfont/src/fontfile/fileio.c
+++ b/libXfont/src/fontfile/fileio.c
@@ -36,6 +36,9 @@ in this Software without prior written authorization from The Open Group.
#ifndef O_BINARY
#define O_BINARY O_RDONLY
#endif
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
FontFilePtr
FontFileOpen (const char *name)
@@ -44,7 +47,7 @@ FontFileOpen (const char *name)
int len;
BufFilePtr raw, cooked;
- fd = open (name, O_BINARY);
+ fd = open (name, O_BINARY|O_CLOEXEC);
if (fd < 0)
return 0;
raw = BufFileOpenRead (fd);