diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-11 12:04:22 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-11 12:04:22 +0100 |
| commit | 020644b613452cc7ab48474b463e4a9d1088d8a3 (patch) | |
| tree | b1e2ae353ab1f58e0513bf5cef15ea87eacba1ff /multilib/lib32-glibc/glibc-2.15-scanf.patch | |
| parent | 9268c5eeb9d68cd786f5a7beaed3b5672adb5287 (diff) | |
| parent | 9d1489b877a1fa7c2674cf1f744804db42d93bfc (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/librep/PKGBUILD
extra/pixman/PKGBUILD
Diffstat (limited to 'multilib/lib32-glibc/glibc-2.15-scanf.patch')
| -rw-r--r-- | multilib/lib32-glibc/glibc-2.15-scanf.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/multilib/lib32-glibc/glibc-2.15-scanf.patch b/multilib/lib32-glibc/glibc-2.15-scanf.patch deleted file mode 100644 index 7655ae5ab..000000000 --- a/multilib/lib32-glibc/glibc-2.15-scanf.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 20b38e0301279a37a3f1e769843933bcc0d5f736 Mon Sep 17 00:00:00 2001 -From: Paul Pluzhnikov <ppluzhnikov@google.com> -Date: Sun, 8 Jan 2012 20:13:35 -0500 -Subject: [PATCH 1/1] sscanf always calls realloc - ---- - ChangeLog | 5 +++++ - stdio-common/vfscanf.c | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c -index 0e71deb..e18a6c3 100644 ---- a/stdio-common/vfscanf.c -+++ b/stdio-common/vfscanf.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 1991-2006, 2007, 2010, 2011 Free Software Foundation, Inc. -+/* Copyright (C) 1991-2007, 2010, 2011, 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -274,7 +274,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr, - CHAR_T *old = wp; \ - size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax \ - ? UCHAR_MAX + 1 : 2 * wpmax); \ -- if (use_malloc || __libc_use_alloca (newsize)) \ -+ if (use_malloc || !__libc_use_alloca (newsize)) \ - { \ - wp = realloc (use_malloc ? wp : NULL, newsize); \ - if (wp == NULL) \ --- -1.7.3.4 - |