clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix pointer truncation cases

Browse Source
This commit is contained in:
Anatol Belski 2015-08-15 11:26:20 +02:00
parent 0bd7d7a369
commit 228eaf5bc4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ext/mbstring/oniguruma/regint.h
View File

@ -227,17 +227,17 @@
} while(0)
/* sizeof(OnigCodePoint) */
#define WORD_ALIGNMENT_SIZE SIZEOF_LONG
#define WORD_ALIGNMENT_SIZE SIZEOF_SIZE_T
#define GET_ALIGNMENT_PAD_SIZE(addr,pad_size) do {\
(pad_size) = WORD_ALIGNMENT_SIZE \
- ((unsigned int )(addr) % WORD_ALIGNMENT_SIZE);\
- ((size_t)(addr) % WORD_ALIGNMENT_SIZE);\
if ((pad_size) == WORD_ALIGNMENT_SIZE) (pad_size) = 0;\
} while (0)
#define ALIGNMENT_RIGHT(addr) do {\
(addr) += (WORD_ALIGNMENT_SIZE - 1);\
(addr) -= ((unsigned int )(addr) % WORD_ALIGNMENT_SIZE);\
(addr) -= ((size_t)(addr) % WORD_ALIGNMENT_SIZE);\
} while (0)
#endif /* PLATFORM_UNALIGNED_WORD_ACCESS */
@ -688,7 +688,11 @@ typedef struct {
BBuf* mbuf; /* multi-byte info or NULL */
} CClassNode;
#ifdef _WIN64
typedef __int64 OnigStackIndex;
#else
typedef long OnigStackIndex;
#endif
typedef struct _OnigStackType {
unsigned int type;