Hello community, here is the log from the commit of package libXfont for openSUSE:Factory checked in at 2015-03-19 21:02:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libXfont (Old) and /work/SRC/openSUSE:Factory/.libXfont.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXfont" Changes: -------- --- /work/SRC/openSUSE:Factory/libXfont/libXfont.changes 2014-07-27 08:25:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libXfont.new/libXfont.changes 2015-03-19 21:02:43.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Mar 18 09:23:04 UTC 2015 - [email protected] + +- Update to release 1.5.1 + * This release of libXfont provides the fixes for the + security advisory about BDF font parsing bugs (CVE-2015-1802, + CVE-2015-1803, CVE-2015-1804) + +------------------------------------------------------------------- Old: ---- libXfont-1.5.0.tar.bz2 New: ---- libXfont-1.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libXfont.spec ++++++ --- /var/tmp/diff_new_pack.Qn70Sf/_old 2015-03-19 21:02:44.000000000 +0100 +++ /var/tmp/diff_new_pack.Qn70Sf/_new 2015-03-19 21:02:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libXfont # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libXfont %define lname libXfont1 -Version: 1.5.0 +Version: 1.5.1 Release: 0 Summary: X font handling library for server and utilities License: MIT ++++++ libXfont-1.5.0.tar.bz2 -> libXfont-1.5.1.tar.bz2 ++++++ ++++ 3494 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.5.0/ChangeLog new/libXfont-1.5.1/ChangeLog --- old/libXfont-1.5.0/ChangeLog 2014-07-19 19:00:49.000000000 +0200 +++ new/libXfont-1.5.1/ChangeLog 2015-03-17 16:16:31.000000000 +0100 @@ -1,3 +1,85 @@ +commit da4246c98bc51297daeec47c15181e179df94013 +Author: Alan Coopersmith <[email protected]> +Date: Tue Mar 17 08:12:19 2015 -0700 + + libXfont 1.5.1 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 2351c83a77a478b49cba6beb2ad386835e264744 +Author: Alan Coopersmith <[email protected]> +Date: Fri Mar 6 22:54:58 2015 -0800 + + bdfReadCharacters: ensure metrics fit into xCharInfo struct [CVE-2015-1804] + + We use 32-bit ints to read from the bdf file, but then try to stick + into a 16-bit int in the xCharInfo struct, so make sure they won't + overflow that range. + + Found by afl-1.24b. + + v2: Verify that additions won't overflow 32-bit int range either. + v3: As Julien correctly observes, the previous check for bh & bw not + being < 0 reduces the number of cases we need to check for overflow. + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + +commit 78c2e3d70d29698244f70164428bd2868c0ab34c +Author: Alan Coopersmith <[email protected]> +Date: Fri Feb 6 15:54:00 2015 -0800 + + bdfReadCharacters: bailout if a char's bitmap cannot be read [CVE-2015-1803] + + Previously would charge on ahead with a NULL pointer in ci->bits, and + then crash later in FontCharInkMetrics() trying to access the bits. + + Found with afl-1.23b. + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + +commit 2deda9906480f9c8ae07b8c2a5510cc7e4c59a8e +Author: Alan Coopersmith <[email protected]> +Date: Fri Feb 6 15:50:45 2015 -0800 + + bdfReadProperties: property count needs range check [CVE-2015-1802] + + Avoid integer overflow or underflow when allocating memory arrays + by multiplying the number of properties reported for a BDF font. + + Reported-by: Ilja Van Sprundel <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + +commit d9fda3d247942292a5f24694c22337c547006e11 +Author: Christos Zoulas <[email protected]> +Date: Wed Feb 25 21:39:30 2015 +0100 + + Set close-on-exec for font file I/O. + + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Thomas Klausner <[email protected]> + +commit 3b33588117c2ca3099b999939985ffe098d479b3 +Author: Alan Coopersmith <[email protected]> +Date: Wed Nov 5 17:41:24 2014 -0800 + + Use 'imdent' to realign cpp indentation levels in fslibos.h + + Parts were indented, others weren't, now is more consistent. + 'git diff -w' shows no non-whitespace changes in this commit + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 03c035b061a0582159467dcadfc8e95074e2a84f +Author: Alan Coopersmith <[email protected]> +Date: Wed Nov 5 17:39:05 2014 -0800 + + Remove unneeded checks for #ifndef X_NOT_POSIX + + Signed-off-by: Alan Coopersmith <[email protected]> + commit ad4f4d8a2d0730c0ea3c09210bf921638b4682bc Author: Alan Coopersmith <[email protected]> Date: Sat Jul 19 09:49:23 2014 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.5.0/compile new/libXfont-1.5.1/compile --- old/libXfont-1.5.0/compile 2014-07-19 18:52:25.000000000 +0200 +++ new/libXfont-1.5.1/compile 2015-03-17 16:12:39.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.5.0/configure.ac new/libXfont-1.5.1/configure.ac --- old/libXfont-1.5.0/configure.ac 2014-07-19 18:52:07.000000000 +0200 +++ new/libXfont-1.5.1/configure.ac 2015-03-17 16:12:29.000000000 +0100 @@ -21,7 +21,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXfont], [1.5.0], +AC_INIT([libXfont], [1.5.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.5.0/missing new/libXfont-1.5.1/missing --- old/libXfont-1.5.0/missing 2014-07-19 18:52:25.000000000 +0200 +++ new/libXfont-1.5.1/missing 2015-03-17 16:12:39.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.5.0/src/bitmap/bdfread.c new/libXfont-1.5.1/src/bitmap/bdfread.c --- old/libXfont-1.5.0/src/bitmap/bdfread.c 2014-07-19 18:52:07.000000000 +0200 +++ new/libXfont-1.5.1/src/bitmap/bdfread.c 2015-03-17 16:12:29.000000000 +0100 @@ -62,8 +62,16 @@ #if HAVE_STDINT_H #include <stdint.h> -#elif !defined(INT32_MAX) -#define INT32_MAX 0x7fffffff +#else +# ifndef INT32_MAX +# define INT32_MAX 0x7fffffff +# endif +# ifndef INT16_MAX +# define INT16_MAX 0x7fff +# endif +# ifndef INT16_MIN +# define INT16_MIN (0 - 0x8000) +# endif #endif #define INDICES 256 @@ -417,6 +425,12 @@ bdfError("DWIDTH y value must be zero\n"); goto BAILOUT; } + /* xCharInfo metrics are stored as INT16 */ + if ((wx < 0) || (wx > INT16_MAX)) { + bdfError("character '%s' has out of range width, %d\n", + charName, wx); + goto BAILOUT; + } line = bdfGetLine(file, lineBuf, BDFLINELEN); if ((!line) || (sscanf((char *) line, "BBX %d %d %d %d", &bw, &bh, &bl, &bb) != 4)) { bdfError("bad 'BBX'\n"); @@ -427,6 +441,14 @@ charName, bw, bh); goto BAILOUT; } + /* xCharInfo metrics are read as int, but stored as INT16 */ + if ((bl > INT16_MAX) || (bl < INT16_MIN) || + (bb > INT16_MAX) || (bb < INT16_MIN) || + (bw > (INT16_MAX - bl)) || (bh > (INT16_MAX - bb))) { + bdfError("character '%s' has out of range metrics, %d %d %d %d\n", + charName, bl, (bl+bw), (bh+bb), -bb); + goto BAILOUT; + } line = bdfGetLine(file, lineBuf, BDFLINELEN); if ((line) && (bdfIsPrefix(line, "ATTRIBUTES"))) { for (p = line + strlen("ATTRIBUTES "); @@ -458,7 +480,10 @@ ci->metrics.descent = -bb; ci->metrics.characterWidth = wx; ci->bits = NULL; - bdfReadBitmap(ci, file, bit, byte, glyph, scan, bitmapsSizes); + if (!bdfReadBitmap(ci, file, bit, byte, glyph, scan, bitmapsSizes)) { + bdfError("could not read bitmap for character '%s'\n", charName); + goto BAILOUT; + } ci++; ndx++; } else @@ -604,7 +629,9 @@ bdfError("missing 'STARTPROPERTIES'\n"); return (FALSE); } - if (sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) { + if ((sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) || + (nProps <= 0) || + (nProps > ((INT32_MAX / sizeof(FontPropRec)) - BDF_GENPROPS))) { bdfError("bad 'STARTPROPERTIES'\n"); return (FALSE); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.5.0/src/fc/fslibos.h new/libXfont-1.5.1/src/fc/fslibos.h --- old/libXfont-1.5.0/src/fc/fslibos.h 2014-07-19 18:52:07.000000000 +0200 +++ new/libXfont-1.5.1/src/fc/fslibos.h 2015-03-17 16:12:29.000000000 +0100 @@ -43,176 +43,174 @@ * makedepend screws up on #undef OPEN_MAX, so we define a new symbol */ -#ifndef FONT_OPEN_MAX +# ifndef FONT_OPEN_MAX -#ifndef X_NOT_POSIX -# ifdef _POSIX_SOURCE -# include <limits.h> -# else -# define _POSIX_SOURCE -# include <limits.h> -# undef _POSIX_SOURCE -# endif -#endif -#ifndef SIZE_MAX -# ifdef ULONG_MAX -# define SIZE_MAX ULONG_MAX -# else -# define SIZE_MAX UINT_MAX -# endif -#endif -#ifndef OPEN_MAX -#if defined(SVR4) -#define OPEN_MAX 256 -#else -#include <sys/param.h> -#ifndef OPEN_MAX -#ifdef __OSF1__ -#define OPEN_MAX 256 -#else -#ifdef NOFILE -#define OPEN_MAX NOFILE -#else -#define OPEN_MAX NOFILES_MAX -#endif -#endif -#endif -#endif -#endif - -#if OPEN_MAX > 256 -#define FONT_OPEN_MAX 256 -#else -#define FONT_OPEN_MAX OPEN_MAX -#endif +# ifdef _POSIX_SOURCE +# include <limits.h> +# else +# define _POSIX_SOURCE +# include <limits.h> +# undef _POSIX_SOURCE +# endif +# ifndef SIZE_MAX +# ifdef ULONG_MAX +# define SIZE_MAX ULONG_MAX +# else +# define SIZE_MAX UINT_MAX +# endif +# endif +# ifndef OPEN_MAX +# if defined(SVR4) +# define OPEN_MAX 256 +# else +# include <sys/param.h> +# ifndef OPEN_MAX +# ifdef __OSF1__ +# define OPEN_MAX 256 +# else +# ifdef NOFILE +# define OPEN_MAX NOFILE +# else +# define OPEN_MAX NOFILES_MAX +# endif +# endif +# endif +# endif +# endif + +# if OPEN_MAX > 256 +# define FONT_OPEN_MAX 256 +# else +# define FONT_OPEN_MAX OPEN_MAX +# endif -#endif /* FONT_OPEN_MAX */ +# endif /* FONT_OPEN_MAX */ -#ifdef WORD64 -#define NMSKBITS 64 -#else -#define NMSKBITS 32 -#endif +# ifdef WORD64 +# define NMSKBITS 64 +# else +# define NMSKBITS 32 +# endif -#define MSKCNT ((FONT_OPEN_MAX + NMSKBITS - 1) / NMSKBITS) +# define MSKCNT ((FONT_OPEN_MAX + NMSKBITS - 1) / NMSKBITS) typedef unsigned long FdSet[MSKCNT]; typedef FdSet FdSetPtr; -#if (MSKCNT==1) -#define BITMASK(i) (1 << (i)) -#define MASKIDX(i) 0 -#endif +# if (MSKCNT==1) +# define BITMASK(i) (1 << (i)) +# define MASKIDX(i) 0 +# endif -#if (MSKCNT>1) -#define BITMASK(i) (1 << ((i) & (NMSKBITS - 1))) -#define MASKIDX(i) ((i) / NMSKBITS) -#endif +# if (MSKCNT>1) +# define BITMASK(i) (1 << ((i) & (NMSKBITS - 1))) +# define MASKIDX(i) ((i) / NMSKBITS) +# endif -#define MASKWORD(buf, i) buf[MASKIDX(i)] -#define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i) -#define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i) -#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i)) - -#if (MSKCNT==1) -#define COPYBITS(src, dst) dst[0] = src[0] -#define CLEARBITS(buf) buf[0] = 0 -#define MASKANDSETBITS(dst, b1, b2) dst[0] = (b1[0] & b2[0]) -#define ORBITS(dst, b1, b2) dst[0] = (b1[0] | b2[0]) -#define UNSETBITS(dst, b1) (dst[0] &= ~b1[0]) -#define ANYSET(src) (src[0]) -#endif +# define MASKWORD(buf, i) buf[MASKIDX(i)] +# define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i) +# define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i) +# define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i)) + +# if (MSKCNT==1) +# define COPYBITS(src, dst) dst[0] = src[0] +# define CLEARBITS(buf) buf[0] = 0 +# define MASKANDSETBITS(dst, b1, b2) dst[0] = (b1[0] & b2[0]) +# define ORBITS(dst, b1, b2) dst[0] = (b1[0] | b2[0]) +# define UNSETBITS(dst, b1) (dst[0] &= ~b1[0]) +# define ANYSET(src) (src[0]) +# endif -#if (MSKCNT==2) -#define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; } -#define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; } -#define MASKANDSETBITS(dst, b1, b2) {\ +# if (MSKCNT==2) +# define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; } +# define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; } +# define MASKANDSETBITS(dst, b1, b2) {\ dst[0] = (b1[0] & b2[0]);\ dst[1] = (b1[1] & b2[1]); } -#define ORBITS(dst, b1, b2) {\ +# define ORBITS(dst, b1, b2) {\ dst[0] = (b1[0] | b2[0]);\ dst[1] = (b1[1] | b2[1]); } -#define UNSETBITS(dst, b1) {\ +# define UNSETBITS(dst, b1) {\ dst[0] &= ~b1[0]; \ dst[1] &= ~b1[1]; } -#define ANYSET(src) (src[0] || src[1]) -#endif +# define ANYSET(src) (src[0] || src[1]) +# endif -#if (MSKCNT==3) -#define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; \ +# if (MSKCNT==3) +# define COPYBITS(src, dst) { dst[0] = src[0]; dst[1] = src[1]; \ dst[2] = src[2]; } -#define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; buf[2] = 0; } -#define MASKANDSETBITS(dst, b1, b2) {\ +# define CLEARBITS(buf) { buf[0] = 0; buf[1] = 0; buf[2] = 0; } +# define MASKANDSETBITS(dst, b1, b2) {\ dst[0] = (b1[0] & b2[0]);\ dst[1] = (b1[1] & b2[1]);\ dst[2] = (b1[2] & b2[2]); } -#define ORBITS(dst, b1, b2) {\ +# define ORBITS(dst, b1, b2) {\ dst[0] = (b1[0] | b2[0]);\ dst[1] = (b1[1] | b2[1]);\ dst[2] = (b1[2] | b2[2]); } -#define UNSETBITS(dst, b1) {\ +# define UNSETBITS(dst, b1) {\ dst[0] &= ~b1[0]; \ dst[1] &= ~b1[1]; \ dst[2] &= ~b1[2]; } -#define ANYSET(src) (src[0] || src[1] || src[2]) -#endif +# define ANYSET(src) (src[0] || src[1] || src[2]) +# endif -#if (MSKCNT==4) -#define COPYBITS(src, dst) dst[0] = src[0]; dst[1] = src[1]; \ +# if (MSKCNT==4) +# define COPYBITS(src, dst) dst[0] = src[0]; dst[1] = src[1]; \ dst[2] = src[2]; dst[3] = src[3] -#define CLEARBITS(buf) buf[0] = 0; buf[1] = 0; buf[2] = 0; buf[3] = 0 -#define MASKANDSETBITS(dst, b1, b2) \ +# define CLEARBITS(buf) buf[0] = 0; buf[1] = 0; buf[2] = 0; buf[3] = 0 +# define MASKANDSETBITS(dst, b1, b2) \ dst[0] = (b1[0] & b2[0]);\ dst[1] = (b1[1] & b2[1]);\ dst[2] = (b1[2] & b2[2]);\ dst[3] = (b1[3] & b2[3]) -#define ORBITS(dst, b1, b2) \ +# define ORBITS(dst, b1, b2) \ dst[0] = (b1[0] | b2[0]);\ dst[1] = (b1[1] | b2[1]);\ dst[2] = (b1[2] | b2[2]);\ dst[3] = (b1[3] | b2[3]) -#define UNSETBITS(dst, b1) \ +# define UNSETBITS(dst, b1) \ dst[0] &= ~b1[0]; \ dst[1] &= ~b1[1]; \ dst[2] &= ~b1[2]; \ dst[3] &= ~b1[3] -#define ANYSET(src) (src[0] || src[1] || src[2] || src[3]) -#endif +# define ANYSET(src) (src[0] || src[1] || src[2] || src[3]) +# endif -#if (MSKCNT>4) -#define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src,\ +# if (MSKCNT>4) +# define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src,\ MSKCNT*sizeof(long)) -#define CLEARBITS(buf) bzero((caddr_t) buf, MSKCNT*sizeof(long)) -#define MASKANDSETBITS(dst, b1, b2) \ +# define CLEARBITS(buf) bzero((caddr_t) buf, MSKCNT*sizeof(long)) +# define MASKANDSETBITS(dst, b1, b2) \ { int cri; \ for (cri=MSKCNT; --cri>=0; ) \ dst[cri] = (b1[cri] & b2[cri]); } -#define ORBITS(dst, b1, b2) \ +# define ORBITS(dst, b1, b2) \ { int cri; \ for (cri=MSKCNT; --cri>=0; ) \ dst[cri] = (b1[cri] | b2[cri]); } -#define UNSETBITS(dst, b1) \ +# define UNSETBITS(dst, b1) \ { int cri; \ for (cri=MSKCNT; --cri>=0; ) \ dst[cri] &= ~b1[cri]; } -#if (MSKCNT==8) -#define ANYSET(src) (src[0] || src[1] || src[2] || src[3] || \ +# if (MSKCNT==8) +# define ANYSET(src) (src[0] || src[1] || src[2] || src[3] || \ src[4] || src[5] || src[6] || src[7]) -#endif -#endif +# endif +# endif #else /* not WIN32 */ -#include <X11/Xwinsock.h> -#include <X11/Xw32defs.h> +# include <X11/Xwinsock.h> +# include <X11/Xw32defs.h> typedef fd_set FdSet; typedef FdSet *FdSetPtr; -#define CLEARBITS(set) FD_ZERO(&set) -#define BITSET(set,s) FD_SET(s,&set) -#define BITCLEAR(set,s) FD_CLR(s,&set) -#define GETBIT(set,s) FD_ISSET(s,&set) -#define ANYSET(set) set->fd_count +# define CLEARBITS(set) FD_ZERO(&set) +# define BITSET(set,s) FD_SET(s,&set) +# define BITCLEAR(set,s) FD_CLR(s,&set) +# define GETBIT(set,s) FD_ISSET(s,&set) +# define ANYSET(set) set->fd_count #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.5.0/src/fontfile/fileio.c new/libXfont-1.5.1/src/fontfile/fileio.c --- old/libXfont-1.5.0/src/fontfile/fileio.c 2014-07-19 18:52:07.000000000 +0200 +++ new/libXfont-1.5.1/src/fontfile/fileio.c 2015-03-17 16:12:29.000000000 +0100 @@ -36,6 +36,9 @@ #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 @@ 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); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.5.0/src/fontfile/filewr.c new/libXfont-1.5.1/src/fontfile/filewr.c --- old/libXfont-1.5.0/src/fontfile/filewr.c 2014-07-19 18:52:07.000000000 +0200 +++ new/libXfont-1.5.1/src/fontfile/filewr.c 2015-03-17 16:12:29.000000000 +0100 @@ -33,17 +33,19 @@ #endif #include <X11/fonts/fntfilio.h> #include <X11/Xos.h> +#ifndef O_BINARY +#define O_BINARY 0 +#endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif FontFilePtr FontFileOpenWrite (const char *name) { int fd; -#if defined(WIN32) || defined(__CYGWIN__) - fd = open (name, O_CREAT|O_TRUNC|O_RDWR|O_BINARY, 0666); -#else - fd = creat (name, 0666); -#endif + fd = open (name, O_CREAT|O_TRUNC|O_RDWR|O_BINARY|O_CLOEXEC, 0666); if (fd < 0) return 0; return (FontFilePtr) BufFileOpenWrite (fd); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
