php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

zend: introducing ZEND_ELEMENT_COUNT for struct's dynamic arrays. (#12650)

Browse Source 
zend: introducing ZEND_ELEMENT_COUNT for struct's dynamic and flexible arrays.

It is mostly for ubsan and helping array bound checking.
This commit is contained in:
David CARLIER
2023-11-13 12:42:45 +00:00
committed by GitHub
parent 350a692271
commit cc2bf11951
12 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/Optimizer/zend_call_graph.h
View File

@@ -39,7 +39,7 @@ struct _zend_call_info {
bool named_args; /* Function has named arguments */
bool is_prototype; /* An overridden child method may be called */
int num_args; /* Number of arguments, excluding named and variadic arguments */
zend_send_arg_info arg_info[1];
zend_send_arg_info arg_info[1] ZEND_ELEMENT_COUNT(num_args);
};
struct _zend_func_info {

2
Zend/zend.h
View File

@@ -95,7 +95,7 @@ typedef struct _zend_trait_method_reference {
typedef struct _zend_trait_precedence {
zend_trait_method_reference trait_method;
uint32_t num_excludes;
zend_string *exclude_class_names[1];
zend_string *exclude_class_names[1] ZEND_ELEMENT_COUNT(num_excludes);
} zend_trait_precedence;
typedef struct _zend_trait_alias {

2
Zend/zend_ast.h
View File

@@ -191,7 +191,7 @@ typedef struct _zend_ast_list {
zend_ast_attr attr;
uint32_t lineno;
uint32_t children;
zend_ast *child[1];
zend_ast *child[1] ZEND_ELEMENT_COUNT(children);
} zend_ast_list;
/* Lineno is stored in val.u2.lineno */

2
Zend/zend_attributes.h
View File

@@ -58,7 +58,7 @@ typedef struct _zend_attribute {
/* Parameter offsets start at 1, everything else uses 0. */
uint32_t offset;
uint32_t argc;
zend_attribute_arg args[1];
zend_attribute_arg args[1] ZEND_ELEMENT_COUNT(argc);
} zend_attribute;
typedef struct _zend_internal_attribute {

8
Zend/zend_portability.h
View File

@@ -327,6 +327,14 @@ char *alloca();
# define HAVE_BUILTIN_CONSTANT_P
#endif
#if __has_attribute(element_count)
#define ZEND_ELEMENT_COUNT(m) __attribute__((element_count(m)))
#elif __has_attribute(counted_by)
#define ZEND_ELEMENT_COUNT(m) __attribute__((counted_by(m)))
#else
#define ZEND_ELEMENT_COUNT(m)
#endif
#ifdef HAVE_BUILTIN_CONSTANT_P
# define ZEND_CONST_COND(_condition, _default) \
(__builtin_constant_p(_condition) ? (_condition) : (_default))

6
Zend/zend_types.h
View File

@@ -139,7 +139,7 @@ typedef struct {
typedef struct {
uint32_t num_types;
zend_type types[1];
zend_type types[1] ZEND_ELEMENT_COUNT(num_types);
} zend_type_list;
#define _ZEND_TYPE_EXTRA_FLAGS_SHIFT 25
@@ -374,7 +374,7 @@ struct _zend_string {
zend_refcounted_h gc;
zend_ulong h; /* hash value */
size_t len;
char val[1];
char val[1] ZEND_ELEMENT_COUNT(len);
};
typedef struct _Bucket {
@@ -572,7 +572,7 @@ struct _zend_resource {
typedef struct {
size_t num;
size_t num_allocated;
struct _zend_property_info *ptr[1];
struct _zend_property_info *ptr[1] ZEND_ELEMENT_COUNT(num);
} zend_property_info_list;
typedef union {

2
ext/ffi/ffi.c
View File

@@ -912,7 +912,7 @@ typedef struct _zend_ffi_callback_data {
ffi_cif cif;
uint32_t arg_count;
ffi_type *ret_type;
ffi_type *arg_types[0];
ffi_type *arg_types[0] ZEND_ELEMENT_COUNT(arg_count);
} zend_ffi_callback_data;
static void zend_ffi_callback_hash_dtor(zval *zv) /* {{{ */

2
ext/fileinfo/libmagic/cdf.h
View File

@@ -277,7 +277,7 @@ typedef struct {
typedef struct {
size_t cat_num;
cdf_catalog_entry_t cat_e[1];
cdf_catalog_entry_t cat_e[1] ZEND_ELEMENT_COUNT(cat_num);
} cdf_catalog_t;
struct timespec;

2
ext/opcache/jit/zend_jit_internal.h
View File

@@ -538,7 +538,7 @@ struct _zend_jit_trace_stack_frame {
int used_stack;
int old_checked_stack;
int old_peek_checked_stack;
zend_jit_trace_stack stack[1];
zend_jit_trace_stack stack[1] ZEND_ELEMENT_COUNT(used_stack);
};
#define TRACE_FRAME_SHIFT_NUM_ARGS 16

2
ext/opcache/jit/zend_jit_ir.c
View File

@@ -142,7 +142,7 @@
typedef struct _ir_refs {
uint32_t count;
uint32_t limit;
ir_ref refs[0];
ir_ref refs[0] ZEND_ELEMENT_COUNT(count);
} ir_refs;
#define ir_refs_size(_n) (offsetof(ir_refs, refs) + sizeof(ir_ref) * (_n))

2
sapi/fpm/fpm/fpm_scoreboard.h
View File

@@ -67,7 +67,7 @@ struct fpm_scoreboard_s {
int free_proc;
unsigned long int slow_rq;
struct fpm_scoreboard_s *shared;
struct fpm_scoreboard_proc_s procs[];
struct fpm_scoreboard_proc_s procs[] ZEND_ELEMENT_COUNT(nprocs);
};
int fpm_scoreboard_init_main(void);

2
sapi/phpdbg/phpdbg_list.h
View File

@@ -44,7 +44,7 @@ typedef struct {
size_t len;
zend_op_array op_array;
uint32_t lines;
uint32_t line[1];
uint32_t line[1] ZEND_ELEMENT_COUNT(lines);
} phpdbg_file_source;
#endif /* PHPDBG_LIST_H */