Merge branch 'PHP-8.2'

* PHP-8.2:
  Fixed bug GH-10270 Unable to return CURL_READFUNC_PAUSE in readfunc callback
  Fix GH-10672 (pg_lo_open segfaults in the strict_types mode)
This commit is contained in:
George Peter Banyard 2023-02-24 14:33:47 +00:00
commit 51b70e4414
No known key found for this signature in database
GPG key ID: 3306078E3194AEBD
5 changed files with 92 additions and 1 deletions

View file

@ -811,6 +811,8 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
if (Z_TYPE(retval) == IS_STRING) {
length = MIN((int) (size * nmemb), Z_STRLEN(retval));
memcpy(data, Z_STRVAL(retval), length);
} else if (Z_TYPE(retval) == IS_LONG) {
length = Z_LVAL_P(&retval);
}
zval_ptr_dtor(&retval);
}