Skip to content

Commit 76445ca

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: curl: Don't truncate length
2 parents 5a608bb + ed4ae18 commit 76445ca

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

ext/curl/interface.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ static size_t curl_write(char *data, size_t size, size_t nmemb, void *ctx)
537537
return fwrite(data, size, nmemb, write_handler->fp);
538538
case PHP_CURL_RETURN:
539539
if (length > 0) {
540-
smart_str_appendl(&write_handler->buf, data, (int) length);
540+
smart_str_appendl(&write_handler->buf, data, length);
541541
}
542542
break;
543543
case PHP_CURL_USER: {
@@ -814,7 +814,7 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
814814
if (!Z_ISUNDEF(retval)) {
815815
_php_curl_verify_handlers(ch, /* reporterror */ true);
816816
if (Z_TYPE(retval) == IS_STRING) {
817-
length = MIN((size * nmemb), Z_STRLEN(retval));
817+
length = MIN(size * nmemb, Z_STRLEN(retval));
818818
memcpy(data, Z_STRVAL(retval), length);
819819
} else if (Z_TYPE(retval) == IS_LONG) {
820820
length = Z_LVAL_P(&retval);
@@ -845,7 +845,7 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
845845
/* Handle special case write when we're returning the entire transfer
846846
*/
847847
if (ch->handlers.write->method == PHP_CURL_RETURN && length > 0) {
848-
smart_str_appendl(&ch->handlers.write->buf, data, (int) length);
848+
smart_str_appendl(&ch->handlers.write->buf, data, length);
849849
} else {
850850
PHPWRITE(data, length);
851851
}

0 commit comments

Comments
 (0)