Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions ext/soap/php_http.c
Original file line number Diff line number Diff line change
Expand Up @@ -1169,17 +1169,16 @@ int make_http_soap_request(
char *p = strrchr(t, '/');
if (p) {
zend_string *s = zend_string_alloc((p - t) + ZSTR_LEN(new_uri->path) + 2, 0);
strncpy(ZSTR_VAL(s), t, (p - t) + 1);
ZSTR_VAL(s)[(p - t) + 1] = 0;
strcat(ZSTR_VAL(s), ZSTR_VAL(new_uri->path));
memcpy(ZSTR_VAL(s), t, (p - t) + 1);
memcpy(ZSTR_VAL(s) + (p - t) + 1, ZSTR_VAL(new_uri->path), ZSTR_LEN(new_uri->path) + 1);
zend_string_release_ex(new_uri->path, 0);
new_uri->path = s;
}
} else {
zend_string *s = zend_string_alloc(ZSTR_LEN(new_uri->path) + 2, 0);
ZSTR_VAL(s)[0] = '/';
ZSTR_VAL(s)[1] = 0;
strcat(ZSTR_VAL(s), ZSTR_VAL(new_uri->path));
memcpy(ZSTR_VAL(s) + 1, ZSTR_VAL(new_uri->path), ZSTR_LEN(new_uri->path) + 1);
zend_string_release_ex(new_uri->path, 0);
new_uri->path = s;
}
Expand Down
3 changes: 0 additions & 3 deletions ext/soap/php_sdl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2433,7 +2433,6 @@ static HashTable* make_persistent_sdl_function_headers(HashTable *headers, HashT

ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(headers, key, tmp) {
pheader = malloc(sizeof(sdlSoapBindingFunctionHeader));
memset(pheader, 0, sizeof(sdlSoapBindingFunctionHeader));
*pheader = *tmp;

if (pheader->name) {
Expand Down Expand Up @@ -2497,7 +2496,6 @@ static HashTable* make_persistent_sdl_parameters(HashTable *params, HashTable *p

ZEND_HASH_FOREACH_STR_KEY_PTR(params, key, tmp) {
pparam = malloc(sizeof(sdlParam));
memset(pparam, 0, sizeof(sdlParam));
*pparam = *tmp;

if (pparam->paramName) {
Expand Down Expand Up @@ -2539,7 +2537,6 @@ static HashTable* make_persistent_sdl_function_faults(sdlFunctionPtr func, HashT

ZEND_HASH_MAP_FOREACH_STR_KEY_PTR(faults, key, tmp) {
pfault = malloc(sizeof(sdlFault));
memset(pfault, 0, sizeof(sdlFault));
*pfault = *tmp;

if (pfault->name) {
Expand Down
Loading