diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-11 15:22:39 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-11 15:22:39 -0300 |
| commit | d9929db3b4ad2dfeeb19ad71f6016eb8122d0208 (patch) | |
| tree | 72944f18f0c554390a9ced86c8a8e2c06ce6cc47 /staging/glibc/glibc-2.15-scanf.patch | |
| parent | 54452120abed3fa83e394e89110859525788c0ea (diff) | |
| parent | 306ac55c1e99cfb5801ef0d9acf2a11d3994d80d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/hostapd/PKGBUILD
extra/samba/PKGBUILD
staging/ffmpeg/PKGBUILD
Diffstat (limited to 'staging/glibc/glibc-2.15-scanf.patch')
| -rw-r--r-- | staging/glibc/glibc-2.15-scanf.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/staging/glibc/glibc-2.15-scanf.patch b/staging/glibc/glibc-2.15-scanf.patch new file mode 100644 index 000000000..a2561b232 --- /dev/null +++ b/staging/glibc/glibc-2.15-scanf.patch @@ -0,0 +1,19 @@ +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) \ |