AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-25 22:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(__tzfile_read): Take extra memory requested by caller into account when copying TZ string.

Browse Source 
2007-10-16  Ulrich Drepper  <drepper@redhat.com>

	* time/tzfile.c (__tzfile_read): Take extra memory requested by caller
	into account when copying TZ string.
This commit is contained in:
Ulrich Drepper 2007-10-16 22:37:35 +00:00
parent e2cceb5a74
commit 69819d9223
4 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-10-16 Ulrich Drepper <drepper@redhat.com>
* time/tzfile.c (__tzfile_read): Take extra memory requested by caller
into account when copying TZ string.
2007-10-16 Jakub Jelinek <jakub@redhat.com> 2007-10-16 Jakub Jelinek <jakub@redhat.com>
* sysdeps/x86_64/memset.S (memset): Fix sse2_nt_move * sysdeps/x86_64/memset.S (memset): Fix sse2_nt_move

82
nptl/sysdeps/pthread/configure vendored
View File

@ -24,8 +24,8 @@ echo "$as_me: error: CFI directive support in assembler is required" >&2;}
fi fi
echo "$as_me:$LINENO: checking for forced unwind support" >&5 { echo "$as_me:$LINENO: checking for forced unwind support" >&5
echo $ECHO_N "checking for forced unwind support... $ECHO_C" >&6 echo $ECHO_N "checking for forced unwind support... $ECHO_C" >&6; }
if test "${libc_cv_forced_unwind+set}" = set; then if test "${libc_cv_forced_unwind+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
@ -48,39 +48,36 @@ _Unwind_GetCFA (context)
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (ac_try="$ac_link"
(eval $ac_link) 2>conftest.er1 case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$? ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1 rm -f conftest.er1
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } && {
{ ac_try='test -z "$ac_c_werror_flag" test -z "$ac_c_werror_flag" ||
|| test ! -s conftest.err' test ! -s conftest.err
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 } && test -s conftest$ac_exeext &&
(eval $ac_try) 2>&5 $as_test_x conftest$ac_exeext; then
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
libc_cv_forced_unwind=yes libc_cv_forced_unwind=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
libc_cv_forced_unwind=no libc_cv_forced_unwind=no
fi fi
rm -f conftest.err conftest.$ac_objext \
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
fi fi
echo "$as_me:$LINENO: result: $libc_cv_forced_unwind" >&5 { echo "$as_me:$LINENO: result: $libc_cv_forced_unwind" >&5
echo "${ECHO_T}$libc_cv_forced_unwind" >&6 echo "${ECHO_T}$libc_cv_forced_unwind" >&6; }
if test $libc_cv_forced_unwind = yes; then if test $libc_cv_forced_unwind = yes; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_FORCED_UNWIND 1 #define HAVE_FORCED_UNWIND 1
@ -88,8 +85,8 @@ _ACEOF
old_CFLAGS="$CFLAGS" old_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -Werror -fexceptions" CFLAGS="$CFLAGS -Werror -fexceptions"
echo "$as_me:$LINENO: checking for C cleanup handling" >&5 { echo "$as_me:$LINENO: checking for C cleanup handling" >&5
echo $ECHO_N "checking for C cleanup handling... $ECHO_C" >&6 echo $ECHO_N "checking for C cleanup handling... $ECHO_C" >&6; }
if test "${libc_cv_c_cleanup+set}" = set; then if test "${libc_cv_c_cleanup+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
@ -113,39 +110,36 @@ main ()
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (ac_try="$ac_link"
(eval $ac_link) 2>conftest.er1 case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$? ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1 rm -f conftest.er1
cat conftest.err >&5 cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } && {
{ ac_try='test -z "$ac_c_werror_flag" test -z "$ac_c_werror_flag" ||
|| test ! -s conftest.err' test ! -s conftest.err
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 } && test -s conftest$ac_exeext &&
(eval $ac_try) 2>&5 $as_test_x conftest$ac_exeext; then
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
libc_cv_c_cleanup=yes libc_cv_c_cleanup=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
libc_cv_c_cleanup=no libc_cv_c_cleanup=no
fi fi
rm -f conftest.err conftest.$ac_objext \
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
fi fi
echo "$as_me:$LINENO: result: $libc_cv_c_cleanup" >&5 { echo "$as_me:$LINENO: result: $libc_cv_c_cleanup" >&5
echo "${ECHO_T}$libc_cv_c_cleanup" >&6 echo "${ECHO_T}$libc_cv_c_cleanup" >&6; }
CFLAGS="$old_CFLAGS" CFLAGS="$old_CFLAGS"
if test $libc_cv_c_cleanup = no; then if test $libc_cv_c_cleanup = no; then
{ { echo "$as_me:$LINENO: error: the compiler must support C cleanup handling" >&5 { { echo "$as_me:$LINENO: error: the compiler must support C cleanup handling" >&5

8
sysdeps/x86_64/elf/configure vendored
View File

@ -3,8 +3,8 @@
if test "$usetls" != no; then if test "$usetls" != no; then
# Check for support of thread-local storage handling in assembler and linker. # Check for support of thread-local storage handling in assembler and linker.
echo "$as_me:$LINENO: checking for x86-64 TLS support" >&5 { echo "$as_me:$LINENO: checking for x86-64 TLS support" >&5
echo $ECHO_N "checking for x86-64 TLS support... $ECHO_C" >&6 echo $ECHO_N "checking for x86-64 TLS support... $ECHO_C" >&6; }
if test "${libc_cv_x86_64_tls+set}" = set; then if test "${libc_cv_x86_64_tls+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
@ -33,8 +33,8 @@ else
fi fi
rm -f conftest* rm -f conftest*
fi fi
echo "$as_me:$LINENO: result: $libc_cv_x86_64_tls" >&5 { echo "$as_me:$LINENO: result: $libc_cv_x86_64_tls" >&5
echo "${ECHO_T}$libc_cv_x86_64_tls" >&6 echo "${ECHO_T}$libc_cv_x86_64_tls" >&6; }
if test $libc_cv_x86_64_tls = yes; then if test $libc_cv_x86_64_tls = yes; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_TLS_SUPPORT 1 #define HAVE_TLS_SUPPORT 1

2
time/tzfile.c
View File

@ -264,7 +264,7 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
zone_names = (char *) types + num_types * sizeof (struct ttinfo); zone_names = (char *) types + num_types * sizeof (struct ttinfo);
leaps = (struct leap *) ((char *) transitions + leaps_idx); leaps = (struct leap *) ((char *) transitions + leaps_idx);
if (trans_width == 8) if (trans_width == 8)
tzspec = (char *) leaps + num_leaps * sizeof (struct leap); tzspec = (char *) leaps + num_leaps * sizeof (struct leap) + extra;
else else
tzspec = NULL; tzspec = NULL;
if (extra > 0) if (extra > 0)