diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2013-08-16 14:52:25 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-08-16 14:52:25 -0400 |
| commit | dc04b5c29884c0a820bcc562373cb4499ce996d2 (patch) | |
| tree | f442cbb85bf2d2635f3d124d688827f08ad64f88 | |
| parent | 55dc55bc458566a1de1ef4006257ebb2528f404e (diff) | |
| download | glibc-dc04b5c29884c0a820bcc562373cb4499ce996d2.tar.gz glibc-dc04b5c29884c0a820bcc562373cb4499ce996d2.tar.xz glibc-dc04b5c29884c0a820bcc562373cb4499ce996d2.zip | |
Fix localedef segfault when run under exec-shield, PaX or similar
http://bugs.debian.org/198099 http://bugs.debian.org/231438
| -rw-r--r-- | locale/programs/3level.h | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/locale/programs/3level.h b/locale/programs/3level.h index c83cdf205e..1d4553e512 100644 --- a/locale/programs/3level.h +++ b/locale/programs/3level.h @@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } } + +/* GCC ATM seems to do a poor job with pointers to nested functions passed + to inlined functions. Help it a little bit with this hack. */ +#define wchead_table_iterate(tp, fn) \ +do \ + { \ + struct wchead_table *t = (tp); \ + uint32_t index1; \ + for (index1 = 0; index1 < t->level1_size; index1++) \ + { \ + uint32_t lookup1 = t->level1[index1]; \ + if (lookup1 != ((uint32_t) ~0)) \ + { \ + uint32_t lookup1_shifted = lookup1 << t->q; \ + uint32_t index2; \ + for (index2 = 0; index2 < (1 << t->q); index2++) \ + { \ + uint32_t lookup2 = t->level2[index2 + lookup1_shifted]; \ + if (lookup2 != ((uint32_t) ~0)) \ + { \ + uint32_t lookup2_shifted = lookup2 << t->p; \ + uint32_t index3; \ + for (index3 = 0; index3 < (1 << t->p); index3++) \ + { \ + struct element_t *lookup3 \ + = t->level3[index3 + lookup2_shifted]; \ + if (lookup3 != NULL) \ + fn ((((index1 << t->q) + index2) << t->p) + index3, \ + lookup3); \ + } \ + } \ + } \ + } \ + } \ + } while (0) + #endif #ifndef NO_ADD_LOCALE |