From d37c3367dbfc2acc6337ee996a438d9f9ea8ef06 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Thu, 19 Mar 2009 23:11:54 +0000 Subject: [PATCH] MFB: Fixed bug #47721 (Aligment issues in mbstring and sysvshm extension) --- ext/mbstring/oniguruma/regint.h | 2 +- ext/sysvshm/sysvshm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/mbstring/oniguruma/regint.h b/ext/mbstring/oniguruma/regint.h index 96f9e45b77..11f3c43af9 100644 --- a/ext/mbstring/oniguruma/regint.h +++ b/ext/mbstring/oniguruma/regint.h @@ -232,7 +232,7 @@ #define NULL_UCHARP ((UChar* )0) #ifndef PLATFORM_UNALIGNED_WORD_ACCESS -#define WORD_ALIGNMENT_SIZE SIZEOF_INT +#define WORD_ALIGNMENT_SIZE SIZEOF_LONG #define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\ (pad_size) = WORD_ALIGNMENT_SIZE \ diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index aadc10055a..9f62086e3a 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -357,7 +357,7 @@ static int php_put_shm_data(sysvshm_chunk_head *ptr, long key, const char *data, long total_size; long shm_varpos; - total_size = ((long) (len + sizeof(sysvshm_chunk) - 1) / 4) * 4 + 4; /* 4-byte alligment */ + total_size = ((long) (len + sizeof(sysvshm_chunk) - 1) / sizeof(long)) * sizeof(long) + sizeof(long); /* long alligment */ if ((shm_varpos = php_check_shm_data(ptr, key)) > 0) { php_remove_shm_data(ptr, shm_varpos); -- 2.50.1