videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

qt: fix leak of network resources from RoundImage 

also add documentation to address ambiguity in object ownership
This commit is contained in:
Prince Gupta 2024-03-11 12:34:32 +05:30 committed by Jean-Baptiste Kempf
parent cc922574c6
commit dafc146cf8
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/gui/qt/widgets/native/roundimage.cpp
View File

@ -104,7 +104,15 @@ namespace
class ImageReader : public AsyncTask<QImage>
{
public:
// requestedSize is only taken as hint, the Image is resized with PreserveAspectCrop
/**
* @brief ImageReader
* @param device i/o source to read from, ImageReader doesn't take owner ship of the device
* parent must make sure availability of device through out the lifetime of this instance
*
* @param requestedSize only taken as hint, the Image is resized with PreserveAspectCrop
*
* @param radius
*/
ImageReader(QIODevice *device, QSize requestedSize, const qreal radius)
: device {device}
, requestedSize {requestedSize}
@ -182,11 +190,19 @@ namespace
class NetworkImageResponse : public QQuickImageResponse
{
public:
/**
* @brief NetworkImageResponse
* @param reply - Network reply to read from, NetworkImageResponse takes ownership of this object
* @param requestedSize - passed to ImageReader class
* @param radius - passed to ImageReader class
*/
NetworkImageResponse(QNetworkReply *reply, QSize requestedSize, const qreal radius)
: reply {reply}
, requestedSize {requestedSize}
, radius {radius}
{
reply->setParent(this);
QObject::connect(reply, &QNetworkReply::finished
, this, &NetworkImageResponse::handleNetworkReplyFinished);
}
@ -216,6 +232,8 @@ namespace
{
error = reply->errorString();
emit finished();
releaseNetworkReply();
return;
}
@ -226,12 +244,20 @@ namespace
error = reader->errorString();
reader.reset();
releaseNetworkReply();
emit finished();
});
reader->start(*QThreadPool::globalInstance());
}
void releaseNetworkReply()
{
reply->deleteLater();
reply = nullptr;
}
QNetworkReply *reply;
QSize requestedSize;
qreal radius;