From 8bb0e48889807a1421c15ab0eeaac198df27c7e5 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 11 Mar 2011 10:02:17 -0500 Subject: [PATCH] match dimensions so we can use all slots without invoking OOB-array-access --- arch/i386/bits/alltypes.h.sh | 10 +++++----- arch/x86_64/bits/alltypes.h.sh | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh index 27289ea0..c6201b9d 100755 --- a/arch/i386/bits/alltypes.h.sh +++ b/arch/i386/bits/alltypes.h.sh @@ -84,16 +84,16 @@ TYPEDEF int pthread_once_t; TYPEDEF int pthread_key_t; TYPEDEF int pthread_spinlock_t; -TYPEDEF struct { union { int __i[9]; size_t __s[2]; } __u; } pthread_attr_t; +TYPEDEF struct { union { int __i[9]; size_t __s[9]; } __u; } pthread_attr_t; TYPEDEF unsigned pthread_mutexattr_t; TYPEDEF unsigned pthread_condattr_t; TYPEDEF unsigned pthread_barrierattr_t; TYPEDEF struct { unsigned __attr[2]; } pthread_rwlockattr_t; -TYPEDEF struct { union { int __i[6]; void *__p[1]; } __u; } pthread_mutex_t; -TYPEDEF struct { union { int __i[12]; void *__p[1]; } __u; } pthread_cond_t; -TYPEDEF struct { union { int __i[8]; void *__p[1]; } __u; } pthread_rwlock_t; -TYPEDEF struct { union { int __i[5]; void *__p[1]; } __u; } pthread_barrier_t; +TYPEDEF struct { union { int __i[6]; void *__p[6]; } __u; } pthread_mutex_t; +TYPEDEF struct { union { int __i[12]; void *__p[12]; } __u; } pthread_cond_t; +TYPEDEF struct { union { int __i[8]; void *__p[8]; } __u; } pthread_rwlock_t; +TYPEDEF struct { union { int __i[5]; void *__p[5]; } __u; } pthread_barrier_t; TYPEDEF long long off_t; diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh index 05c0b7dc..b0aecd9c 100755 --- a/arch/x86_64/bits/alltypes.h.sh +++ b/arch/x86_64/bits/alltypes.h.sh @@ -84,16 +84,16 @@ TYPEDEF int pthread_once_t; TYPEDEF int pthread_key_t; TYPEDEF int pthread_spinlock_t; -TYPEDEF struct { union { int __i[14]; size_t __s[2]; } __u; } pthread_attr_t; +TYPEDEF struct { union { int __i[14]; size_t __s[7]; } __u; } pthread_attr_t; TYPEDEF unsigned pthread_mutexattr_t; TYPEDEF unsigned pthread_condattr_t; TYPEDEF unsigned pthread_barrierattr_t; TYPEDEF struct { unsigned __attr[2]; } pthread_rwlockattr_t; -TYPEDEF struct { union { int __i[10]; void *__p[1]; } __u; } pthread_mutex_t; -TYPEDEF struct { union { int __i[12]; void *__p[1]; } __u; } pthread_cond_t; -TYPEDEF struct { union { int __i[14]; void *__p[1]; } __u; } pthread_rwlock_t; -TYPEDEF struct { union { int __i[8]; void *__p[1]; } __u; } pthread_barrier_t; +TYPEDEF struct { union { int __i[10]; void *__p[5]; } __u; } pthread_mutex_t; +TYPEDEF struct { union { int __i[12]; void *__p[6]; } __u; } pthread_cond_t; +TYPEDEF struct { union { int __i[14]; void *__p[7]; } __u; } pthread_rwlock_t; +TYPEDEF struct { union { int __i[8]; void *__p[4]; } __u; } pthread_barrier_t; TYPEDEF long off_t; -- 2.25.1