CVS commit: xsrc/external/mit/fontconfig/dist/src

2018-01-28 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Sun Jan 28 16:44:15 UTC 2018

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcmatch.c

Log Message:
CID-1428671: Unchecked malloc/strdup


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/fontconfig/dist/src/fcmatch.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcmatch.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.9 xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.10
--- xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.9	Wed Aug 30 16:11:59 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcmatch.c	Sun Jan 28 11:44:15 2018
@@ -703,6 +703,12 @@ FcFontSetMatchInternal (FcFontSet   **se
 	FcBool f = FcTrue;
 
 	ss = s = strdup (env);
+	if (ss == NULL)
+	{
+		fprintf (stderr, "Fontconfig Error: %s\n",
+			strerror (errno));
+		exit (1);
+	}
 	os = FcObjectSetCreate ();
 	while (f)
 	{
@@ -719,6 +725,12 @@ FcFontSetMatchInternal (FcFontSet   **se
 		len = (p - s) + 1;
 		}
 		x = malloc (sizeof (char) * len);
+		if (x == NULL)
+		{
+			fprintf (stderr, "Fontconfig Error: %s\n",
+			strerror (errno));
+			exit (1);
+		}
 		strncpy (x, s, len - 1);
 		x[len - 1] = 0;
 		if (FcObjectFromName (x) > 0)

CVS commit: xsrc/external/mit/fontconfig/dist/src

2018-01-28 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Sun Jan 28 16:43:32 UTC 2018

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcstat.c

Log Message:
CID-1428670: Uncheck malloc


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/fontconfig/dist/src/fcstat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcstat.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.7 xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.8
--- xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.7	Tue Aug 29 04:38:50 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcstat.c	Sun Jan 28 11:43:32 2018
@@ -202,7 +202,7 @@ FcScandir (const char		*dirp,
 if (!d)
 	return -1;
 
-dlist = (struct dirent **) malloc (sizeof (struct dirent *) * lsize);
+dlist = malloc (sizeof (struct dirent *) * lsize);
 if (!dlist)
 {
 	closedir (d);
@@ -217,14 +217,17 @@ FcScandir (const char		*dirp,
 	{
 	size_t dentlen = FcPtrToOffset (dent, dent->d_name) + strlen (dent->d_name) + 1;
 	dentlen = ((dentlen + ALIGNOF_VOID_P - 1) & ~(ALIGNOF_VOID_P - 1));
-	p = (struct dirent *) malloc (dentlen);
+	p = malloc (dentlen);
+	if (!p) 
+		goto out;
 	memcpy (p, dent, dentlen);
 	if ((n + 1) >= lsize)
 	{
 		lsize += 128;
-		dlp = (struct dirent **) realloc (dlist, sizeof (struct dirent *) * lsize);
+		dlp = realloc (dlist, sizeof (struct dirent *) * lsize);
 		if (!dlp)
 		{
+out:
 		free_dirent (dlist);
 		closedir (d);
 		errno = ENOMEM;

CVS commit: xsrc/external/mit/fontconfig/dist/src

2017-08-31 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Thu Aug 31 19:44:02 UTC 2017

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcobjshash.h

Log Message:
use static inline


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/fontconfig/dist/src/fcobjshash.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcobjshash.h
diff -u xsrc/external/mit/fontconfig/dist/src/fcobjshash.h:1.1.1.2 xsrc/external/mit/fontconfig/dist/src/fcobjshash.h:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcobjshash.h:1.1.1.2	Tue Aug 29 04:32:28 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcobjshash.h	Thu Aug 31 15:44:01 2017
@@ -190,7 +190,7 @@ __inline
 __attribute__ ((__gnu_inline__))
 #endif
 #endif
-const struct FcObjectTypeInfo *
+static const struct FcObjectTypeInfo *
 FcObjectTypeLookup (register const char *str, register unsigned int len)
 {
   enum

CVS commit: xsrc/external/mit/fontconfig/dist/src

2017-08-30 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Wed Aug 30 20:11:59 UTC 2017

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcmatch.c

Log Message:
reapply the missing part this patch:
>Deal with the limited range of VAX floating point numbers when compiling
>for VAX.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/fontconfig/dist/src/fcmatch.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcmatch.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.8 xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.9
--- xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.8	Tue Aug 29 08:38:50 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcmatch.c	Wed Aug 30 20:11:59 2017
@@ -376,17 +376,10 @@ FcCompareValueList (FcObject	 object
 	return FcTrue;
 }
 
-#if 0
 best = DBL_MAX;
 bestStrong = DBL_MAX;
 bestWeak = DBL_MAX;
 j = 1;
-#else
-best = 1e99;
-bestStrong = 1e99;
-bestWeak = 1e99;
-j = 0;
-#endif
 for (v1 = v1orig; v1; v1 = FcValueListNext(v1))
 {
 	for (v2 = v2orig, k = 0; v2; v2 = FcValueListNext(v2), k++)

CVS commit: xsrc/external/mit/fontconfig/dist/src

2017-08-30 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Wed Aug 30 20:09:45 UTC 2017

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcfreetype.c

Log Message:
achVendID is an array not a pointer so it is always "true".
avoid clang warnings by not testing it.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/fontconfig/dist/src/fcfreetype.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcfreetype.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcfreetype.c:1.1.1.7 xsrc/external/mit/fontconfig/dist/src/fcfreetype.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcfreetype.c:1.1.1.7	Tue Aug 29 08:32:28 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcfreetype.c	Wed Aug 30 20:09:45 2017
@@ -1286,7 +1286,7 @@ FcFreeTypeQueryFace (const FT_Face  face
 
 if (os2 && os2->version >= 0x0001 && os2->version != 0x)
 {
-	if (os2->achVendID && os2->achVendID[0] != 0)
+	if (os2->achVendID[0] != 0)
 	{
 	foundry_ = (FcChar8 *) malloc (sizeof (os2->achVendID) + 1);
 	memcpy ((void *)foundry_, os2->achVendID, sizeof (os2->achVendID));

CVS commit: xsrc/external/mit/fontconfig/dist/src

2017-08-29 Thread Maya Rashish 
Module Name:xsrc
Committed By:   maya
Date:   Tue Aug 29 16:47:07 UTC 2017

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcobjs.c

Log Message:
Build fix. don't provide a conflicting declaration of FcObjectTypeHash and
FcObjectTypeLookup. they're defined in fcobjshash.h included just after.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/fontconfig/dist/src/fcobjs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcobjs.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcobjs.c:1.1.1.3 xsrc/external/mit/fontconfig/dist/src/fcobjs.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcobjs.c:1.1.1.3	Tue Aug 29 08:32:28 2017
+++ xsrc/external/mit/fontconfig/dist/src/fcobjs.c	Tue Aug 29 16:47:07 2017
@@ -24,12 +24,6 @@
 
 #include "fcint.h"
 
-static unsigned int
-FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
-
-static const struct FcObjectTypeInfo *
-FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
-
 #include "fcobjshash.h"
 
 #include

CVS commit: xsrc/external/mit/fontconfig/dist/src

2016-12-16 Thread Martin Husemann 
Module Name:xsrc
Committed By:   martin
Date:   Fri Dec 16 15:10:08 UTC 2016

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcstat.c

Log Message:
Undo a local change now that our scandir() signature has been fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/dist/src/fcstat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcstat.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.5 xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.6
--- xsrc/external/mit/fontconfig/dist/src/fcstat.c:1.5	Sat Jul 12 04:11:34 2014
+++ xsrc/external/mit/fontconfig/dist/src/fcstat.c	Fri Dec 16 15:10:08 2016
@@ -166,11 +166,8 @@ FcDirChecksumScandirFilter(const struct 
 
 #ifdef HAVE_SCANDIR
 static int
-FcDirChecksumScandirSorter(const void *arg1, const void *arg2)
+FcDirChecksumScandirSorter(const struct dirent **lhs, const struct dirent **rhs)
 {
-const struct dirent * const *lhs = arg1;
-const struct dirent * const *rhs = arg2;
-
 return strcmp((*lhs)->d_name, (*rhs)->d_name);
 }
 #elif HAVE_SCANDIR_VOID_P

CVS commit: xsrc/external/mit/fontconfig/dist/src

2015-04-29 Thread Taylor R Campbell 
Module Name:xsrc
Committed By:   riastradh
Date:   Wed Apr 29 21:04:52 UTC 2015

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcinit.c

Log Message:
Switch #pragma message(...) to #warning so it actually does anything.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/fontconfig/dist/src/fcinit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcinit.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcinit.c:1.1.1.4 xsrc/external/mit/fontconfig/dist/src/fcinit.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcinit.c:1.1.1.4	Mon Jun  3 19:44:51 2013
+++ xsrc/external/mit/fontconfig/dist/src/fcinit.c	Wed Apr 29 21:04:52 2015
@@ -26,13 +26,13 @@
 #include 
 
 #if defined(FC_ATOMIC_INT_NIL)
-#pragma message("Could not find any system to define atomic_int macros, library may NOT be thread-safe.")
+#warning Could not find any system to define atomic_int macros, library may NOT be thread-safe.
 #endif
 #if defined(FC_MUTEX_IMPL_NIL)
-#pragma message("Could not find any system to define mutex macros, library may NOT be thread-safe.")
+#warning Could not find any system to define mutex macros, library may NOT be thread-safe.
 #endif
 #if defined(FC_ATOMIC_INT_NIL) || defined(FC_MUTEX_IMPL_NIL)
-#pragma message("To suppress these warnings, define FC_NO_MT.")
+#warning To suppress these warnings, define FC_NO_MT.
 #endif
 
 static FcConfig *

CVS commit: xsrc/external/mit/fontconfig/dist/src

2015-01-04 Thread Joerg Sonnenberger 
Module Name:xsrc
Committed By:   joerg
Date:   Sun Jan  4 18:08:34 UTC 2015

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fccache.c

Log Message:
Avoid __UNVOLATILE here, just inline the cast. We don't have
src/tools/compat's header here.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/fontconfig/dist/src/fccache.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.7 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.8
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.7	Fri Dec 19 18:10:18 2014
+++ xsrc/external/mit/fontconfig/dist/src/fccache.c	Sun Jan  4 18:08:34 2015
@@ -297,7 +297,7 @@ free_lock (void)
   lock = fc_atomic_ptr_get (&cache_lock);
   if (lock && fc_atomic_ptr_cmpexch (&cache_lock, lock, NULL)) {
 FcMutexFinish (lock);
-free (__UNVOLATILE(lock));
+free (((void *)(uintptr_t)lock));
   }
 }

CVS commit: xsrc/external/mit/fontconfig/dist/src

2014-12-19 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Fri Dec 19 18:10:18 UTC 2014

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fccache.c

Log Message:
on vax mutexes are volatile.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/dist/src/fccache.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.6 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.7
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.6	Sat Jul 12 00:11:34 2014
+++ xsrc/external/mit/fontconfig/dist/src/fccache.c	Fri Dec 19 13:10:18 2014
@@ -297,7 +297,7 @@ free_lock (void)
   lock = fc_atomic_ptr_get (&cache_lock);
   if (lock && fc_atomic_ptr_cmpexch (&cache_lock, lock, NULL)) {
 FcMutexFinish (lock);
-free (lock);
+free (__UNVOLATILE(lock));
   }
 }

CVS commit: xsrc/external/mit/fontconfig/dist/src

2014-03-20 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Thu Mar 20 08:04:41 UTC 2014

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fccfg.c

Log Message:
avoid CPP when the C compiler can do it more sanely.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/fontconfig/dist/src/fccfg.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fccfg.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.1.1.5 xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fccfg.c:1.1.1.5	Thu Mar 20 07:41:43 2014
+++ xsrc/external/mit/fontconfig/dist/src/fccfg.c	Thu Mar 20 08:04:41 2014
@@ -1546,19 +1546,19 @@ FcConfigSubstituteWithPat (FcConfig*
 }
 
 nobjs = FC_MAX_BASE_OBJECT + config->maxObjects + 2;
-value = (FcValueList **) malloc (SIZEOF_VOID_P * nobjs);
+value = (FcValueList **) malloc (sizeof(void *) * nobjs);
 if (!value)
 {
 	retval = FcFalse;
 	goto bail1;
 }
-elt = (FcPatternElt **) malloc (SIZEOF_VOID_P * nobjs);
+elt = (FcPatternElt **) malloc (sizeof(void *) * nobjs);
 if (!elt)
 {
 	retval = FcFalse;
 	goto bail1;
 }
-tst = (FcTest **) malloc (SIZEOF_VOID_P * nobjs);
+tst = (FcTest **) malloc (sizeof(void *) * nobjs);
 if (!tst)
 {
 	retval = FcFalse;

CVS commit: xsrc/external/mit/fontconfig/dist/src

2013-06-27 Thread Thomas Klausner 
Module Name:xsrc
Committed By:   wiz
Date:   Thu Jun 27 12:44:11 UTC 2013

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcname.c

Log Message:
Fix a comparison of constant warning with clang

>From upstream:
commit 9acc14c34a372b54f9075ec3611588298fb2a501
Author: Akira TAGOH 
Date:   Wed Jun 26 12:03:38 2013 +0900


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/dist/src/fcname.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcname.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcname.c:1.4 xsrc/external/mit/fontconfig/dist/src/fcname.c:1.5
--- xsrc/external/mit/fontconfig/dist/src/fcname.c:1.4	Mon Jun  3 19:49:01 2013
+++ xsrc/external/mit/fontconfig/dist/src/fcname.c	Thu Jun 27 12:44:11 2013
@@ -86,7 +86,7 @@ FcObjectValidType (FcObject object, FcTy
 		return FcTrue;
 	break;
 	default:
-	if (t->type == (unsigned int) -1 || type == t->type)
+	if ((unsigned int) t->type == (unsigned int) -1 || type == t->type)
 		return FcTrue;
 	break;
 	}

CVS commit: xsrc/external/mit/fontconfig/dist/src

2013-06-03 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun  3 21:07:44 UTC 2013

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fchash.c

Log Message:
don't try to shift size_t by 32 or more bits on !lp64.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/fontconfig/dist/src/fchash.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fchash.c
diff -u xsrc/external/mit/fontconfig/dist/src/fchash.c:1.1.1.1 xsrc/external/mit/fontconfig/dist/src/fchash.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fchash.c:1.1.1.1	Mon Jun  3 19:44:51 2013
+++ xsrc/external/mit/fontconfig/dist/src/fchash.c	Mon Jun  3 21:07:44 2013
@@ -194,10 +194,12 @@ FcHashGetSHA256Digest (const FcChar8 *in
 block[63 - 1] = (len >>  8) & 0xff;
 block[63 - 2] = (len >> 16) & 0xff;
 block[63 - 3] = (len >> 24) & 0xff;
+#ifdef _LP64
 block[63 - 4] = (len >> 32) & 0xff;
 block[63 - 5] = (len >> 40) & 0xff;
 block[63 - 6] = (len >> 48) & 0xff;
 block[63 - 7] = (len >> 56) & 0xff;
+#endif
 FcHashComputeSHA256Digest (ret, block);
 
 return FcHashSHA256ToString (ret);
@@ -243,10 +245,12 @@ FcHashGetSHA256DigestFromFile (const FcC
 	ibuf[63 - 1] = (v >>  8) & 0xff;
 	ibuf[63 - 2] = (v >> 16) & 0xff;
 	ibuf[63 - 3] = (v >> 24) & 0xff;
+#ifdef _LP64
 	ibuf[63 - 4] = (v >> 32) & 0xff;
 	ibuf[63 - 5] = (v >> 40) & 0xff;
 	ibuf[63 - 6] = (v >> 48) & 0xff;
 	ibuf[63 - 7] = (v >> 56) & 0xff;
+#endif
 	FcHashComputeSHA256Digest (ret, ibuf);
 	break;
 	}
@@ -302,10 +306,12 @@ FcHashGetSHA256DigestFromMemory (const c
 	ibuf[63 - 1] = (v >>  8) & 0xff;
 	ibuf[63 - 2] = (v >> 16) & 0xff;
 	ibuf[63 - 3] = (v >> 24) & 0xff;
+#ifdef _LP64
 	ibuf[63 - 4] = (v >> 32) & 0xff;
 	ibuf[63 - 5] = (v >> 40) & 0xff;
 	ibuf[63 - 6] = (v >> 48) & 0xff;
 	ibuf[63 - 7] = (v >> 56) & 0xff;
+#endif
 	FcHashComputeSHA256Digest (ret, ibuf);
 	break;
 	}

CVS commit: xsrc/external/mit/fontconfig/dist/src

2011-08-11 Thread Joerg Sonnenberger 
Module Name:xsrc
Committed By:   joerg
Date:   Thu Aug 11 21:59:46 UTC 2011

Modified Files:
xsrc/external/mit/fontconfig/dist/src: fccache.c

Log Message:
Fix memset usage


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/fontconfig/dist/src/fccache.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.1.1.2 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.1.1.2	Sun Nov 21 06:35:32 2010
+++ xsrc/external/mit/fontconfig/dist/src/fccache.c	Thu Aug 11 21:59:46 2011
@@ -1157,7 +1157,7 @@
 MD5Transform(ctx->buf, (FcChar32 *) ctx->in);
 byteReverse((unsigned char *) ctx->buf, 4);
 memcpy(digest, ctx->buf, 16);
-memset(ctx, 0, sizeof(ctx));/* In case it's sensitive */
+memset(ctx, 0, sizeof(*ctx));/* In case it's sensitive */
 }

CVS commit: xsrc/external/mit/fontconfig/dist/src

2009-06-12 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Fri Jun 12 18:47:01 UTC 2009

Modified Files:
xsrc/external/mit/fontconfig/dist/src: ftglue.c

Log Message:
work around ssp lossage


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/fontconfig/dist/src/ftglue.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/ftglue.c
diff -u xsrc/external/mit/fontconfig/dist/src/ftglue.c:1.1.1.1 xsrc/external/mit/fontconfig/dist/src/ftglue.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/ftglue.c:1.1.1.1	Tue Jul 29 21:24:25 2008
+++ xsrc/external/mit/fontconfig/dist/src/ftglue.c	Fri Jun 12 14:47:01 2009
@@ -28,6 +28,8 @@
 #define  LOG(x)  do {} while (0)
 #endif
 
+#undef read	/* XXX: SSP/FORTIFY */
+
 /* only used internally */
 static FT_Pointer
 ftglue_qalloc( FT_Memory  memory,