archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Regroup expressions in php_schema.c to avoid array bounds warnings

Browse source
This commit is contained in:
Nikita Popov 2019-04-12 11:11:53 +02:00
parent edcf087ff9
commit 88bfd2ae98
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/soap/php_schema.c
View file

@ -458,7 +458,7 @@ static int schema_list(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr listType, sdlTypeP
{
char buf[MAX_LENGTH_OF_LONG + 1];
char *res = zend_print_long_to_buf(buf + sizeof(buf) - 1, zend_hash_num_elements(sdl->types));
char *str = emalloc(sizeof("anonymous") + buf + sizeof(buf) - 1 - res);
char *str = emalloc(sizeof("anonymous")-1 + (buf + sizeof(buf) - res));
memcpy(str, "anonymous", sizeof("anonymous")-1);
memcpy(str + sizeof("anonymous")-1, res, buf + sizeof(buf) - res);
@ -555,7 +555,7 @@ static int schema_union(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr unionType, sdlTyp
{
char buf[MAX_LENGTH_OF_LONG + 1];
char *res = zend_print_long_to_buf(buf + sizeof(buf) - 1, zend_hash_num_elements(sdl->types));
char *str = emalloc(sizeof("anonymous") + buf + sizeof(buf) - 1 - res);
char *str = emalloc(sizeof("anonymous")-1 + (buf + sizeof(buf) - res));
memcpy(str, "anonymous", sizeof("anonymous")-1);
memcpy(str + sizeof("anonymous")-1, res, buf + sizeof(buf) - res);
@ -1799,6 +1799,7 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl
smart_str_free(&key);
} else{
soap_error0(E_ERROR, "Parsing Schema: attribute has no 'name' nor 'ref' attributes");
return FALSE; /* the above call is noreturn, but not marked as such */
}
/* type = QName */
@ -1927,7 +1928,7 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl
{
char buf[MAX_LENGTH_OF_LONG + 1];
char *res = zend_print_long_to_buf(buf + sizeof(buf) - 1, zend_hash_num_elements(sdl->types));
char *str = emalloc(sizeof("anonymous") + buf + sizeof(buf) - 1 - res);
char *str = emalloc(sizeof("anonymous")-1 + (buf + sizeof(buf) - res));
memcpy(str, "anonymous", sizeof("anonymous")-1);
memcpy(str + sizeof("anonymous")-1, res, buf + sizeof(buf) - res);