1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix PLATFORM_GET_INC

Browse Source 
On platforms where unaligned word access is not allowed, and if
`sizeof(val)` and `sizeof(type)` differ:

- `val` > `type`, `val` will be a garbage.
- `val` < `type`, outside `val` will be clobbered.
This commit is contained in:
Nobuyoshi Nakada 2023-04-16 17:45:27 +09:00
parent 29e01c6f5f
commit fac814c2dc
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2023-04-16 09:37:28 +00:00 
Merged: https://github.com/ruby/ruby/pull/7723
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
regexec.c
View File

@ -3464,7 +3464,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (ischanged && msa->enable_cache_match_opt) {
RelAddrType rel;
OnigUChar *addr;
int mem;
MemNumType mem;
UChar* tmp = p;
switch (*tmp++) {
case OP_JUMP:

9
regint.h
View File

@ -319,9 +319,13 @@ RUBY_SYMBOL_EXPORT_BEGIN
#define ONIG_LAST_CODE_POINT (~((OnigCodePoint )0))
#define PLATFORM_GET_INC_ARGUMENTS_ASSERT(val, type) \
((void)sizeof(char[2 * (sizeof(val) == sizeof(type)) - 1]))
#ifdef PLATFORM_UNALIGNED_WORD_ACCESS
# define PLATFORM_GET_INC(val,p,type) do{\
PLATFORM_GET_INC_ARGUMENTS_ASSERT(val, type);\
val = *(type* )p;\
(p) += sizeof(type);\
} while(0)
@ -329,7 +333,10 @@ RUBY_SYMBOL_EXPORT_BEGIN
#else
# define PLATFORM_GET_INC(val,p,type) do{\
xmemcpy(&val, (p), sizeof(type));\
PLATFORM_GET_INC_ARGUMENTS_ASSERT(val, type);\
type platform_get_value;\
xmemcpy(&platform_get_value, (p), sizeof(type));\
val = platform_get_value;\
(p) += sizeof(type);\
} while(0)