From 1714af172178a90580b101d94f435bf286798b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 26 Jul 2024 15:32:20 +0200 Subject: [PATCH] QNetworkRequest::transferTimeout: saturate int return value So the value is at least sufficiently large even if int could not fully represent it. From the API review. [ChangeLog][QtNetwork][QNetworkRequest] The transferTimeout() function now returns INT_MIN or INT_MAX when transferTimeoutAsDuration().count() cannot be represented in an int. Change-Id: Ic37ad5bc19ea7da4041c989acd3b989923d48cef Reviewed-by: Marc Mutz (cherry picked from commit 7fb3a18282281023bd8e47e9dae79dbab3660848) Reviewed-by: Qt Cherry-pick Bot --- src/network/access/qnetworkrequest.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h index 368eb99d955..fa312bfe6f7 100644 --- a/src/network/access/qnetworkrequest.h +++ b/src/network/access/qnetworkrequest.h @@ -11,6 +11,8 @@ #include #include +#include + QT_BEGIN_NAMESPACE class QSslConfiguration; @@ -194,7 +196,7 @@ Q_DECLARE_SHARED(QNetworkRequest) #if QT_CONFIG(http) || defined (Q_OS_WASM) int QNetworkRequest::transferTimeout() const { - return int(transferTimeoutAsDuration().count()); + return q26::saturate_cast(transferTimeoutAsDuration().count()); } void QNetworkRequest::setTransferTimeout(int timeout)