[uClibc-cvs] svn commit: trunk/uClibc/libc/sysdeps/linux/common
vapier at uclibc.org
vapier at uclibc.org
Tue Jun 7 00:58:05 UTC 2005
Author: vapier
Date: 2005-06-06 18:58:04 -0600 (Mon, 06 Jun 2005)
New Revision: 10476
Log:
move tv def back with gettimeofday() func
Modified:
trunk/uClibc/libc/sysdeps/linux/common/ssp.c
Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/common/ssp.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/ssp.c 2005-06-05 20:07:30 UTC (rev 10475)
+++ trunk/uClibc/libc/sysdeps/linux/common/ssp.c 2005-06-07 00:58:04 UTC (rev 10476)
@@ -66,7 +66,6 @@
void __guard_setup(void)
{
size_t size;
- struct timeval tv;
if (__guard != 0UL)
return;
@@ -111,9 +110,11 @@
/* Everything failed? Or we are using a weakened model of the
* terminator canary */
-
- gettimeofday(&tv, NULL);
- __guard ^= tv.tv_usec ^ tv.tv_sec;
+ {
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ __guard ^= tv.tv_usec ^ tv.tv_sec;
+ }
}
void __stack_smash_handler(char func[], int damaged __attribute__ ((unused)));
More information about the uClibc-cvs
mailing list