OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

alloca: fix buf interaction 

The stack-grows-down case is missing paren around the buf cast.

The stack-grows-up case is missing a cast with the buf assignment.
This leads to build failures due to -Werror:
vfprintf.c: In function '_IO_vfprintf_internal':
vfprintf.c:1738:16: error: initialization from incompatible pointer type [-Werror]
This commit is contained in:
Mike Frysinger 2015-02-24 00:15:41 -05:00
parent 9438b237ab
commit ba7d2c543f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2015-02-24 Mike Frysinger <vapier@gentoo.org>
* include/alloca.h [_STACK_GROWS_DOWN] (extend_alloca): Add
parenthesis around the buf assignment.
[_STACK_GROWS_UP] (extend_alloca): Add a char* cast.
2015-02-24 Joseph Myers <joseph@codesourcery.com>
[BZ #16783]

4
include/alloca.h
View File

@ -28,7 +28,7 @@ libc_hidden_proto (__libc_alloca_cutoff)
# define extend_alloca(buf, len, newlen) \
(__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen); \
char *__newbuf = __alloca (__newlen); \
if (__newbuf + __newlen == (char *) buf) \
if (__newbuf + __newlen == (char *) (buf)) \
len += __newlen; \
else \
len = __newlen; \
@ -37,7 +37,7 @@ libc_hidden_proto (__libc_alloca_cutoff)
# define extend_alloca(buf, len, newlen) \
(__typeof (buf)) ({ size_t __newlen = stackinfo_alloca_round (newlen); \
char *__newbuf = __alloca (__newlen); \
char *__buf = (buf); \
char *__buf = (char *) (buf); \
if (__buf + len == __newbuf) \
{ \
len += __newlen; \