Skip to content

Fix compile warnings under GCC 15.2.1 #21320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndossche merged 1 commit into from
Mar 2, 2026
Merged

Fix compile warnings under GCC 15.2.1 #21320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Zend/zend_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static zend_always_inline void zend_hash_real_init_mixed_ex(HashTable *ht)
void *data;
uint32_t nSize = ht->nTableSize;

ZEND_ASSERT(HT_SIZE_TO_MASK(nSize));
ZEND_ASSERT(HT_SIZE_TO_MASK(nSize) != 0);

if (UNEXPECTED(GC_FLAGS(ht) & IS_ARRAY_PERSISTENT)) {
data = pemalloc(HT_SIZE_EX(nSize, HT_SIZE_TO_MASK(nSize)), 1);
Expand Down Expand Up @@ -351,7 +351,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_packed_to_hash(HashTable *ht)
uint32_t i;
uint32_t nSize = ht->nTableSize;

ZEND_ASSERT(HT_SIZE_TO_MASK(nSize));
ZEND_ASSERT(HT_SIZE_TO_MASK(nSize) != 0);

HT_ASSERT_RC1(ht);
// Alloc before assign to avoid inconsistencies on OOM
Expand Down Expand Up @@ -399,7 +399,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_extend(HashTable *ht, uint32_t nSize, bool

if (nSize == 0) return;

ZEND_ASSERT(HT_SIZE_TO_MASK(nSize));
ZEND_ASSERT(HT_SIZE_TO_MASK(nSize) != 0);

if (UNEXPECTED(HT_FLAGS(ht) & HASH_FLAG_UNINITIALIZED)) {
if (nSize > ht->nTableSize) {
Expand Down Expand Up @@ -1318,7 +1318,7 @@ static void ZEND_FASTCALL zend_hash_do_resize(HashTable *ht)
uint32_t nSize = ht->nTableSize + ht->nTableSize;
Bucket *old_buckets = ht->arData;

ZEND_ASSERT(HT_SIZE_TO_MASK(nSize));
ZEND_ASSERT(HT_SIZE_TO_MASK(nSize) != 0);

new_data = pemalloc(HT_SIZE_EX(nSize, HT_SIZE_TO_MASK(nSize)), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
ht->nTableSize = nSize;
Expand Down
4 changes: 2 additions & 2 deletions ext/filter/logical_filters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
}
/* }}} */

static int _php_filter_validate_ipv4(char *str, size_t str_len, int *ip) /* {{{ */
static int _php_filter_validate_ipv4(const char *str, size_t str_len, int *ip) /* {{{ */
{
const char *end = str + str_len;
int num, m;
Expand Down Expand Up @@ -764,7 +764,7 @@ static int _php_filter_validate_ipv6(const char *str, size_t str_len, int ip[8])
int blocks = 0;
unsigned int num, n;
int i;
char *ipv4;
const char *ipv4;
const char *end;
int ip4elm[4];
const char *s = str;
Expand Down
4 changes: 2 additions & 2 deletions ext/iconv/iconv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ static zend_result php_iconv_output_handler(void **nothing, php_output_context *

if (mimetype != NULL && (!(output_context->op & PHP_OUTPUT_HANDLER_CLEAN) || ((output_context->op & PHP_OUTPUT_HANDLER_START) && !(output_context->op & PHP_OUTPUT_HANDLER_FINAL)))) {
size_t len;
char *p = strstr(get_output_encoding(), "//");
const char *p = strstr(get_output_encoding(), "//");

if (p) {
len = spprintf(&content_type, 0, "Content-Type:%.*s; charset=%.*s", mimetype_len ? mimetype_len : (int) strlen(mimetype), mimetype, (int) (p - get_output_encoding()), get_output_encoding());
Expand Down Expand Up @@ -2577,7 +2577,7 @@ static php_stream_filter *php_iconv_stream_filter_factory_create(const char *nam
{
php_stream_filter *retval = NULL;
php_iconv_stream_filter *inst;
char *from_charset = NULL, *to_charset = NULL;
const char *from_charset = NULL, *to_charset = NULL;
size_t from_charset_len, to_charset_len;

if ((from_charset = strchr(name, '.')) == NULL) {
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/exec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ PHPAPI zend_string *php_escape_shell_cmd(const zend_string *unescaped_cmd)
size_t x, y;
zend_string *cmd;
#ifndef PHP_WIN32
char *p = NULL;
const char *p = NULL;
#endif

ZEND_ASSERT(ZSTR_LEN(unescaped_cmd) == strlen(ZSTR_VAL(unescaped_cmd)) && "Must be a binary safe string");
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/filters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1559,7 +1559,7 @@ static php_stream_filter *strfilter_convert_create(const char *filtername, zval
php_convert_filter *inst;
php_stream_filter *retval = NULL;

char *dot;
const char *dot;
int conv_mode = 0;

if (filterparams != NULL && Z_TYPE_P(filterparams) != IS_ARRAY) {
Expand Down
22 changes: 11 additions & 11 deletions ext/standard/user_filters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ static php_stream_filter *user_filter_factory_create(const char *filtername,
len = strlen(filtername);

/* determine the classname/class entry */
if (NULL == (fdat = zend_hash_str_find_ptr(BG(user_filter_map), (char*)filtername, len))) {
char *period;
if (NULL == (fdat = zend_hash_str_find_ptr(BG(user_filter_map), filtername, len))) {
const char *period;

/* Userspace Filters using ambiguous wildcards could cause problems.
i.e.: myfilter.foo.bar will always call into myfilter.foo.*
Expand All @@ -272,16 +272,16 @@ static php_stream_filter *user_filter_factory_create(const char *filtername,

/* Search for wildcard matches instead */
memcpy(wildcard, filtername, len + 1); /* copy \0 */
period = wildcard + (period - filtername);
while (period) {
ZEND_ASSERT(period[0] == '.');
period[1] = '*';
period[2] = '\0';
char *new_period = wildcard + (period - filtername);
while (new_period) {
ZEND_ASSERT(new_period[0] == '.');
new_period[1] = '*';
new_period[2] = '\0';
if (NULL != (fdat = zend_hash_str_find_ptr(BG(user_filter_map), wildcard, strlen(wildcard)))) {
period = NULL;
new_period = NULL;
} else {
*period = '\0';
period = strrchr(wildcard, '.');
*new_period = '\0';
new_period = strrchr(wildcard, '.');
}
}
efree(wildcard);
Expand Down Expand Up @@ -311,7 +311,7 @@ static php_stream_filter *user_filter_factory_create(const char *filtername,
}

/* filtername */
add_property_string(&obj, "filtername", (char*)filtername);
add_property_string(&obj, "filtername", filtername);

/* and the parameters, if any */
if (filterparams) {
Expand Down
2 changes: 1 addition & 1 deletion main/fastcgi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ static int is_port_number(const char *bindpath)

int fcgi_listen(const char *path, int backlog)
{
char *s;
const char *s;
int tcp = 0;
char host[MAXPATHLEN];
short port = 0;
Expand Down
2 changes: 1 addition & 1 deletion main/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
{
zend_string *replace_origin = NULL;
char *docref_buf = NULL, *target = NULL;
char *docref_target = "", *docref_root = "";
const char *docref_target = "", *docref_root = "";
char *p;
const char *space = "";
const char *class_name = "";
Expand Down
2 changes: 1 addition & 1 deletion main/network.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ php_socket_t php_network_bind_socket_to_local_addr(const char *host, unsigned po

PHPAPI zend_result php_network_parse_network_address_with_port(const char *addr, size_t addrlen, struct sockaddr *sa, socklen_t *sl)
{
char *colon;
const char *colon;
char *tmp;
zend_result ret = FAILURE;
short port;
Expand Down
16 changes: 8 additions & 8 deletions main/streams/filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval
const php_stream_filter_factory *factory = NULL;
php_stream_filter *filter = NULL;
size_t n;
char *period;
const char *period;

n = strlen(filtername);

Expand All @@ -236,17 +236,17 @@ PHPAPI php_stream_filter *php_stream_filter_create(const char *filtername, zval

wildname = safe_emalloc(1, n, 3);
memcpy(wildname, filtername, n+1);
period = wildname + (period - filtername);
while (period && !filter) {
ZEND_ASSERT(period[0] == '.');
period[1] = '*';
period[2] = '\0';
char *new_period = wildname + (period - filtername);
while (new_period && !filter) {
ZEND_ASSERT(new_period[0] == '.');
new_period[1] = '*';
new_period[2] = '\0';
if (NULL != (factory = zend_hash_str_find_ptr(filter_hash, wildname, strlen(wildname)))) {
filter = factory->create_filter(filtername, filterparams, persistent);
}

*period = '\0';
period = strrchr(wildname, '.');
*new_period = '\0';
new_period = strrchr(wildname, '.');
}
efree(wildname);
}
Expand Down
5 changes: 3 additions & 2 deletions main/streams/memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,8 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, con
{
php_stream *stream;
php_stream_temp_data *ts;
char *comma, *semi, *sep;
char *comma;
const char *semi, *sep;
size_t mlen, dlen, plen, vlen, ilen;
zend_off_t newoffs;
zval meta;
Expand All @@ -637,7 +638,7 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, con
path += 2;
}

if ((comma = memchr(path, ',', dlen)) == NULL) {
if ((comma = (char *) memchr(path, ',', dlen)) == NULL) {
php_stream_wrapper_log_error(wrapper, options, "rfc2397: no comma in URL");
return NULL;
}
Expand Down
2 changes: 1 addition & 1 deletion main/streams/plain_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,7 @@ PHPAPI php_stream *_php_stream_fopen_with_path(const char *filename, const char
ptr = pathbuf;

while (ptr && *ptr) {
end = strchr(ptr, DEFAULT_DIR_SEPARATOR);
end = (char *) strchr(ptr, DEFAULT_DIR_SEPARATOR);
Copy link
Member

@iluuu1994 iluuu1994 Mar 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this cast, why is it necessary?

Copy link
Member Author

@ndossche ndossche Mar 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ptr is a const char * but end is a char *.
end cannot be made const because it is written to on line 1780. At that point, ptr actually isn't pointing to a constant character buffer anymore.
I didn't want to do too many changes because to fix this nicely we'd need to split the ptr variable.

Copy link
Member

@iluuu1994 iluuu1994 Mar 1, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh ok, so the return type of strchr is now effectively const-generic. Right, it does seem like it would be best to split the vars. I'd prefer that, at least for master.

if (end != NULL) {
*end = '\0';
end++;
Expand Down
4 changes: 2 additions & 2 deletions main/streams/xp_socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ static inline int parse_unix_address(php_stream_xport_param *xparam, struct sock

static inline char *parse_ip_address_ex(const char *str, size_t str_len, int *portno, int get_err, zend_string **err)
{
char *colon;
const char *colon;
char *host = NULL;

if (memchr(str, '\0', str_len)) {
Expand All @@ -628,7 +628,7 @@ static inline char *parse_ip_address_ex(const char *str, size_t str_len, int *po
#ifdef HAVE_IPV6
if (*(str) == '[' && str_len > 1) {
/* IPV6 notation to specify raw address with port (i.e. [fe80::1]:80) */
char *p = memchr(str + 1, ']', str_len - 2);
const char *p = memchr(str + 1, ']', str_len - 2);
if (!p || *(p + 1) != ':') {
if (get_err) {
*err = strpprintf(0, "Failed to parse IPv6 address \"%s\"", str);
Expand Down
2 changes: 1 addition & 1 deletion sapi/phpdbg/phpdbg_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ PHPDBG_API int phpdbg_is_addr(const char *str) /* {{{ */

PHPDBG_API int phpdbg_is_class_method(const char *str, size_t len, char **class, char **method) /* {{{ */
{
char *sep = NULL;
const char *sep = NULL;

if (strstr(str, "#") != NULL)
return 0;
Expand Down