[gentoo-commits] gentoo-x86 commit in dev-util/cvs/files: cvs-1.12.12-cvs-gnulib-vasnprintf.patch

[Patrick Lauer (patrick)]

patrick     09/02/01 18:04:46

  Added:                cvs-1.12.12-cvs-gnulib-vasnprintf.patch
  Log:
  Fixing cvs to work with gcc 4.3.3 which enables FORTIFY_SOURCES. Fixes #230849. Patch from Bruno Haible <bruno@×××××.org>, thanks to Magnus Granberg <zorry@×××.nu> for some hints and explanations.
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-util/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch?rev=1.1&content-type=text/plain

Index: cvs-1.12.12-cvs-gnulib-vasnprintf.patch
===================================================================
http://bugs.gentoo.org/213833

commit 913c09becd9df89dbd9b9f386e7f35c240d5efe8
Author: Bruno Haible <bruno@×××××.org>
Date:   Fri Oct 19 01:50:42 2007 +0200

    Don't use %n on glibc >= 2.3 systems.

diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index f563823..5d818aa 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -3385,9 +3385,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 #endif
 		  *p = dp->conversion;
 #if USE_SNPRINTF
+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))
 		p[1] = '%';
 		p[2] = 'n';
 		p[3] = '\0';
+# else
+		/* On glibc2 systems from glibc >= 2.3 - probably also older
+		   ones - we know that snprintf's returns value conforms to
+		   ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
+		   Therefore we can avoid using %n in this situation.
+		   On glibc2 systems from 2004-10-18 or newer, the use of %n
+		   in format strings in writable memory may crash the program
+		   (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
+		   in this situation.  */
+		p[1] = '\0';
+# endif
 #else
 		p[1] = '\0';
 #endif