diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-04-16 21:53:28 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-04-16 21:53:28 +0900 |
| commit | 77c42988c816a68a6336aef2880d700b403051fe (patch) | |
| tree | c90e44aa7d738242f688979c7d35725bb75307cd /include | |
| parent | 4e45e320b05afb500a9acedc5b7a2c19b2b7158d (diff) | |
| parent | 79a7f181507674a6e56846d1dc82fa97341ec544 (diff) | |
| download | mruby-77c42988c816a68a6336aef2880d700b403051fe.tar.gz mruby-77c42988c816a68a6336aef2880d700b403051fe.zip | |
Merge pull request #4385 from shuujii/avoid-potential-zero-size-array-declaration
Avoid potential zero size array declaration; fix #4382
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/array.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/mruby/array.h b/include/mruby/array.h index 2e6951c0d..0c0a002f5 100644 --- a/include/mruby/array.h +++ b/include/mruby/array.h @@ -33,7 +33,6 @@ struct RArray { } aux; mrb_value *ptr; } heap; - mrb_value embed[MRB_ARY_EMBED_LEN_MAX]; } as; }; @@ -46,7 +45,7 @@ struct RArray { #define ARY_UNSET_EMBED_FLAG(a) ((a)->flags &= ~(MRB_ARY_EMBED_MASK)) #define ARY_EMBED_LEN(a) ((mrb_int)(((a)->flags & MRB_ARY_EMBED_MASK) - 1)) #define ARY_SET_EMBED_LEN(a,len) ((a)->flags = ((a)->flags&~MRB_ARY_EMBED_MASK) | ((uint32_t)(len) + 1)) -#define ARY_EMBED_PTR(a) (&((a)->as.embed[0])) +#define ARY_EMBED_PTR(a) ((mrb_value*)&(a)->as) #define ARY_LEN(a) (ARY_EMBED_P(a)?ARY_EMBED_LEN(a):(a)->as.heap.len) #define ARY_PTR(a) (ARY_EMBED_P(a)?ARY_EMBED_PTR(a):(a)->as.heap.ptr) |