sizeof

Author: arnaud-lb

Zend/zend_partial.c

@@ -181,7 +181,7 @@ static zp_names *zp_assign_names(uint32_t argc, zval *argv,
 		zend_array *extra_named_params)
 {
 	zp_names *names = zend_arena_calloc(&CG(ast_arena),
-			1, zend_safe_address_guarded(argc, sizeof(zend_string*), offsetof(zp_names, params)));
+			1, zend_safe_address_guarded(argc, sizeof(&names->params[0]), offsetof(zp_names, params)));
 
 	/* Assign names for params. We never rename those. */
 	for (uint32_t offset = 0, num_args = MIN(argc, function->common.num_args);
@@ -741,8 +741,8 @@ static zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
 		new_argc = MAX(new_argc, function->common.num_args);
 	}
 
-	zval *tmp = zend_arena_alloc(&CG(ast_arena), zend_safe_address_guarded(new_argc, sizeof(zval), 0));
-	memcpy(tmp, argv, zend_safe_address_guarded(argc, sizeof(zval), 0));
+	zval *tmp = zend_arena_alloc(&CG(ast_arena), zend_safe_address_guarded(new_argc, sizeof(*tmp), 0));
+	memcpy(tmp, argv, zend_safe_address_guarded(argc, sizeof(*tmp), 0));
 	argv = tmp;
 
 	/* Compute param positions and number of required args, add implicit
@@ -756,7 +756,7 @@ static zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
 	uint32_t num_params = 0;
 	uint32_t num_required = 0;
 	uint32_t *arg_to_param_offset_map = zend_arena_alloc(&CG(ast_arena),
-			zend_safe_address_guarded(new_argc, sizeof(uint32_t*), 0));
+			zend_safe_address_guarded(new_argc, sizeof(*arg_to_param_offset_map), 0));
 	{
 		uint32_t num_positional = 0;
 
@@ -832,7 +832,7 @@ static zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
 			lexical_vars_ast = zend_ast_list_add(lexical_vars_ast, lexical_var_ast);
 		}
 
-		zend_ast **params = zend_arena_calloc(&CG(ast_arena), num_params, sizeof(zend_ast*));
+		zend_ast **params = zend_arena_calloc(&CG(ast_arena), num_params, sizeof(*params));
 		for (uint32_t offset = 0; offset < argc; offset++) {
 			if (Z_IS_PLACEHOLDER_P(&argv[offset])) {
 				zend_arg_info *arg_info = &function->common.arg_info[MIN(offset, function->common.num_args)];

ext/opcache/ZendAccelerator.c

@@ -2145,14 +2145,14 @@ zend_op_array *zend_accel_compile_pfa(zend_ast *ast,
 			/* Extend the lifetime of the called opcodes if
 			 * the called function is a closure.
 			 * See comment in zend_accel_pfa_key(). */
-			zend_op_array *copy = zend_arena_alloc(&CG(arena), sizeof(zend_function));
-			memcpy(copy, called_function, sizeof(zend_op_array));
+			zend_op_array *copy = zend_arena_alloc(&CG(arena), sizeof(*copy));
+			memcpy(copy, called_function, sizeof(*copy));
 			zend_string_addref(copy->function_name);
 			(*copy->refcount)++;
 			/* Reference the copy in op_array->dynamic_func_defs so that it's
 			 * destroyed when op_array is destroyed. */
 			ZEND_ASSERT(!op_array->dynamic_func_defs && !op_array->num_dynamic_func_defs);
-			op_array->dynamic_func_defs = emalloc(sizeof(zend_op_array*));
+			op_array->dynamic_func_defs = emalloc(sizeof(&op_array->dynamic_func_defs[0]));
 			op_array->dynamic_func_defs[0] = copy;
 			op_array->num_dynamic_func_defs = 1;
 		}
@@ -2168,7 +2168,7 @@ zend_op_array *zend_accel_compile_pfa(zend_ast *ast,
 
 	zend_persistent_script *new_persistent_script = create_persistent_script();
 	new_persistent_script->script.main_op_array = *op_array;
-	efree_size(op_array, sizeof(zend_op_array));
+	efree_size(op_array, sizeof(*op_array));
 	new_persistent_script->script.filename = key;
 
 	if (ZCG(accel_directives).record_warnings) {