[gentoo-commits] gentoo-x86 commit in dev-libs/mpc/files: mpc-0.6-fortify.patch

[Ryan Hill (dirtyepic)]

dirtyepic    09/08/01 05:10:04

  Added:                mpc-0.6-fortify.patch
  Log:
  Move into main tree
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-libs/mpc/files/mpc-0.6-fortify.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/mpc/files/mpc-0.6-fortify.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/mpc/files/mpc-0.6-fortify.patch?rev=1.1&content-type=text/plain

Index: mpc-0.6-fortify.patch
===================================================================
Fix testsuite failure w/ -D_FORTIFY_SOURCE=2
http://lists.gforge.inria.fr/pipermail/mpc-discuss/2009-April/000404.html

--- mpc-0.6-orig/src/inp_str.c
+++ mpc-0.6/src/inp_str.c
@@ -1,6 +1,6 @@
 /* mpc_inp_str -- Input a complex number from a given stream.
 
-Copyright (C) 2009 Andreas Enge, Philippe Th\'eveny, Paul Zimmermann.
+Copyright (C) 2009 Andreas Enge, Philippe Th\'eveny, Paul Zimmermann
 
 This file is part of the MPC Library.
 
@@ -80,6 +80,7 @@ extract_string (FILE *stream)
   size_t nread = 0;
   size_t strsize = 100;
   char *str = mpc_alloc_str (strsize);
+  size_t lenstr;
 
   c = getc (stream);
   while (c != EOF && c != '\n'
@@ -101,6 +102,8 @@ extract_string (FILE *stream)
   if (nread == 0)
     return str;
 
+  lenstr = nread;
+
   if (c == '(') {
     size_t n;
     char *suffix;
@@ -127,7 +130,7 @@ extract_string (FILE *stream)
       strsize = nread + 1;
     }
 
-    n = sprintf (str, "%s(%s", str, suffix);
+    n = lenstr + sprintf (str + lenstr, "(%s", suffix);
     MPC_ASSERT (n == nread);
 
     c = getc (stream);
@@ -151,7 +154,9 @@ extract_string (FILE *stream)
 
 
 int
-mpc_inp_str (mpc_ptr rop, FILE *stream, size_t *read, int base, mpc_rnd_t rnd_mode) {
+mpc_inp_str (mpc_ptr rop, FILE *stream, size_t *read, int base,
+mpc_rnd_t rnd_mode)
+{
    size_t white, nread = 0;
    int inex = -1;
    int c;