File 0001-Fix-memory-leaks-6376.patch of Package clementine

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-memory-leaks-6376.patch of Package clementine (Revision d5518a35762fb4175a6fbce1badd1dde)

Currently displaying revision d5518a35762fb4175a6fbce1badd1dde , Show latest

From 546078c317fdbe27a3c99b5c110a4b3310d96d54 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Fri, 2 Aug 2019 17:24:26 +0200
Subject: [PATCH] Fix memory leaks (#6376)

---
 ext/libclementine-tagreader/cloudstream.cpp |  5 ++---
 ext/libclementine-tagreader/cloudstream.h   |  9 ++++-----
 ext/libclementine-tagreader/tagreader.cpp   | 12 ++----------
 ext/libclementine-tagreader/tagreader.h     | 11 +++++++----
 src/playlist/playlistdelegates.cpp          |  2 ++
 src/playlist/playlistdelegates.h            |  1 +
 6 files changed, 18 insertions(+), 22 deletions(-)

Index: Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/ext/libclementine-tagreader/cloudstream.cpp
===================================================================
--- Clementine-75f18dab23f0842713a4200a7e362efd51b12e31.orig/ext/libclementine-tagreader/cloudstream.cpp	2019-07-24 12:51:48.000000000 +0200
+++ Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/ext/libclementine-tagreader/cloudstream.cpp	2019-08-03 08:53:22.803405670 +0200
@@ -33,15 +33,14 @@ static const int kTaglibSuffixCacheBytes
 }
 
 CloudStream::CloudStream(const QUrl& url, const QString& filename,
-                         const long length, const QString& auth,
-                         QNetworkAccessManager* network)
+                         const long length, const QString& auth)
     : url_(url),
       filename_(filename),
       encoded_filename_(filename_.toUtf8()),
       length_(length),
       auth_(auth),
       cursor_(0),
-      network_(network),
+      network_(new QNetworkAccessManager),
       cache_(length),
       num_requests_(0) {}
 
Index: Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/ext/libclementine-tagreader/cloudstream.h
===================================================================
--- Clementine-75f18dab23f0842713a4200a7e362efd51b12e31.orig/ext/libclementine-tagreader/cloudstream.h	2019-07-24 12:51:48.000000000 +0200
+++ Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/ext/libclementine-tagreader/cloudstream.h	2019-08-03 08:53:22.803405670 +0200
@@ -18,21 +18,20 @@
 #ifndef GOOGLEDRIVESTREAM_H
 #define GOOGLEDRIVESTREAM_H
 
-#include <QObject>
 #include <QList>
+#include <QNetworkAccessManager>
+#include <QObject>
 #include <QSslError>
 #include <QUrl>
 
 #include <google/sparsetable>
 #include <taglib/tiostream.h>
 
-class QNetworkAccessManager;
-
 class CloudStream : public QObject, public TagLib::IOStream {
   Q_OBJECT
  public:
   CloudStream(const QUrl& url, const QString& filename, const long length,
-              const QString& auth, QNetworkAccessManager* network);
+              const QString& auth);
 
   // Taglib::IOStream
   virtual TagLib::FileName name() const;
@@ -73,7 +72,7 @@ class CloudStream : public QObject, publ
   const QString auth_;
 
   int cursor_;
-  QNetworkAccessManager* network_;
+  std::unique_ptr<QNetworkAccessManager> network_;
 
   google::sparsetable<char> cache_;
   int num_requests_;
Index: Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/ext/libclementine-tagreader/tagreader.cpp
===================================================================
--- Clementine-75f18dab23f0842713a4200a7e362efd51b12e31.orig/ext/libclementine-tagreader/tagreader.cpp	2019-07-24 12:51:48.000000000 +0200
+++ Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/ext/libclementine-tagreader/tagreader.cpp	2019-08-03 08:53:22.803405670 +0200
@@ -22,7 +22,6 @@
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QFileInfo>
-#include <QNetworkAccessManager>
 #include <QTextCodec>
 #include <QUrl>
 #include <QVector>
@@ -77,12 +76,6 @@
 #define NumberToASFAttribute(x) \
   TagLib::ASF::Attribute(QStringToTaglibString(QString::number(x)))
 
-class FileRefFactory {
- public:
-  virtual ~FileRefFactory() {}
-  virtual TagLib::FileRef* GetFileRef(const QString& filename) = 0;
-};
-
 class TagLibFileRefFactory : public FileRefFactory {
  public:
   virtual TagLib::FileRef* GetFileRef(const QString& filename) {
@@ -122,7 +115,6 @@ const char* kASF_OriginalYear_ID = "WM/O
 
 TagReader::TagReader()
     : factory_(new TagLibFileRefFactory),
-      network_(new QNetworkAccessManager),
       kEmbeddedCover("(embedded)") {}
 
 void TagReader::ReadFile(const QString& filename,
@@ -1332,8 +1324,8 @@ bool TagReader::ReadCloudFile(const QUrl
                               pb::tagreader::SongMetadata* song) const {
   qLog(Debug) << "Loading tags from" << title;
 
-  std::unique_ptr<CloudStream> stream(new CloudStream(
-      download_url, title, size, authorisation_header, network_));
+  std::unique_ptr<CloudStream> stream(
+      new CloudStream(download_url, title, size, authorisation_header));
   stream->Precache();
   std::unique_ptr<TagLib::File> tag;
   if (mime_type == "audio/mpeg" &&
Index: Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/ext/libclementine-tagreader/tagreader.h
===================================================================
--- Clementine-75f18dab23f0842713a4200a7e362efd51b12e31.orig/ext/libclementine-tagreader/tagreader.h	2019-07-24 12:51:48.000000000 +0200
+++ Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/ext/libclementine-tagreader/tagreader.h	2019-08-03 08:53:22.803405670 +0200
@@ -21,11 +21,11 @@
 #include <QByteArray>
 
 #include <taglib/xiphcomment.h>
+#include <memory>
 
 #include "config.h"
 #include "tagreadermessages.pb.h"
 
-class QNetworkAccessManager;
 class QString;
 class QTextCodec;
 class QUrl;
@@ -40,7 +40,11 @@ class PopularimeterFrame;
 }
 }
 
-class FileRefFactory;
+class FileRefFactory {
+ public:
+  virtual ~FileRefFactory() {}
+  virtual TagLib::FileRef* GetFileRef(const QString& filename) = 0;
+};
 
 /**
  * This class holds all useful methods to read and write tags from/to files.
@@ -119,8 +123,7 @@ class TagReader {
   static TagLib::ID3v2::PopularimeterFrame* GetPOPMFrameFromTag(
       TagLib::ID3v2::Tag* tag);
 
-  FileRefFactory* factory_;
-  QNetworkAccessManager* network_;
+  std::unique_ptr<FileRefFactory> factory_;
 
   const std::string kEmbeddedCover;
 };
Index: Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/src/playlist/playlistdelegates.cpp
===================================================================
--- Clementine-75f18dab23f0842713a4200a7e362efd51b12e31.orig/src/playlist/playlistdelegates.cpp	2019-07-24 12:51:48.000000000 +0200
+++ Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/src/playlist/playlistdelegates.cpp	2019-08-03 08:53:22.803405670 +0200
@@ -401,6 +401,8 @@ TagCompleter::TagCompleter(LibraryBacken
              future);
 }
 
+TagCompleter::~TagCompleter() { model()->deleteLater(); }
+
 void TagCompleter::ModelReady(QFuture<TagCompletionModel*> future) {
   TagCompletionModel* model = future.result();
   setModel(model);
Index: Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/src/playlist/playlistdelegates.h
===================================================================
--- Clementine-75f18dab23f0842713a4200a7e362efd51b12e31.orig/src/playlist/playlistdelegates.h	2019-07-24 12:51:48.000000000 +0200
+++ Clementine-75f18dab23f0842713a4200a7e362efd51b12e31/src/playlist/playlistdelegates.h	2019-08-03 08:53:22.803405670 +0200
@@ -157,6 +157,7 @@ class TagCompleter : public QCompleter {
  public:
   TagCompleter(LibraryBackend* backend, Playlist::Column column,
                QLineEdit* editor);
+  ~TagCompleter();
 
  private slots:
   void ModelReady(QFuture<TagCompletionModel*> future);

Places

File 0001-Fix-memory-leaks-6376.patch of Package clementine (Revision d5518a35762fb4175a6fbce1badd1dde)

Places