Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix memory leak when a client downloads tracks.

Browse Source
This commit is contained in:
Andreas 2013-07-16 22:16:05 +02:00
parent 8ac665f372
commit 01084de461
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/networkremote/outgoingdatacreator.cpp
View File

@ -141,8 +141,13 @@ void OutgoingDataCreator::SendDataToClients(pb::remote::Message* msg) {
RemoteClient* client; RemoteClient* client;
foreach(client, *clients_) { foreach(client, *clients_) {
// Do not send data to downloaders // Do not send data to downloaders
if (client->isDownloader()) if (client->isDownloader()) {
if (client->State() != QTcpSocket::ConnectedState) {
clients_->removeAt(clients_->indexOf(client));
delete client;
}
continue; continue;
}
// Check if the client is still active // Check if the client is still active
if (client->State() == QTcpSocket::ConnectedState) { if (client->State() == QTcpSocket::ConnectedState) {
@ -150,7 +155,6 @@ void OutgoingDataCreator::SendDataToClients(pb::remote::Message* msg) {
} else { } else {
clients_->removeAt(clients_->indexOf(client)); clients_->removeAt(clients_->indexOf(client));
delete client; delete client;
qDebug() << "Client deleted";
} }
} }
} }
@ -573,20 +577,24 @@ void OutgoingDataCreator::SendSingleSong(RemoteClient* client, const Song &song,
file.open(QIODevice::ReadOnly); file.open(QIODevice::ReadOnly);
QByteArray data; QByteArray data;
while (!file.atEnd()) {
data = file.read(kFileChunkSize);
pb::remote::Message msg; pb::remote::Message msg;
pb::remote::ResponseSongFileChunk* chunk = msg.mutable_response_song_file_chunk();
msg.set_type(pb::remote::SONG_FILE_CHUNK); msg.set_type(pb::remote::SONG_FILE_CHUNK);
pb::remote::ResponseSongFileChunk* chunk = msg.mutable_response_song_file_chunk(); while (!file.atEnd()) {
// Read file chunk
data = file.read(kFileChunkSize);
// Set chunk data
chunk->set_chunk_count(chunk_count); chunk->set_chunk_count(chunk_count);
chunk->set_chunk_number(chunk_number); chunk->set_chunk_number(chunk_number);
chunk->set_file_count(song_count); chunk->set_file_count(song_count);
chunk->set_file_number(song_no); chunk->set_file_number(song_no);
chunk->set_size(file.size()); chunk->set_size(file.size());
chunk->set_data(data.data(), data.size()); chunk->set_data(data.data(), data.size());
// On the first chunk send the metadata, so the client knows
// what file it receives.
if (chunk_number == 1) { if (chunk_number == 1) {
int i = app_->playlist_manager()->active()->current_row(); int i = app_->playlist_manager()->active()->current_row();
CreateSong( CreateSong(
@ -594,8 +602,12 @@ void OutgoingDataCreator::SendSingleSong(RemoteClient* client, const Song &song,
msg.mutable_response_song_file_chunk()->mutable_song_metadata()); msg.mutable_response_song_file_chunk()->mutable_song_metadata());
} }
// Send data directly to the client
msg.set_version(msg.default_instance().version()); msg.set_version(msg.default_instance().version());
client->SendData(&msg); client->SendData(&msg);
// Clear working data
chunk->Clear();
data.clear(); data.clear();
chunk_number++; chunk_number++;

4
src/networkremote/remoteclient.cpp
View File

@ -52,6 +52,7 @@ RemoteClient::RemoteClient(Application* app, QTcpSocket* client)
RemoteClient::~RemoteClient() { RemoteClient::~RemoteClient() {
client_->abort();
delete client_; delete client_;
} }
@ -124,7 +125,6 @@ void RemoteClient::ParseMessage(const QByteArray &data) {
} }
if (msg.type() == pb::remote::DISCONNECT) { if (msg.type() == pb::remote::DISCONNECT) {
qDebug() << client_->state();
client_->abort(); client_->abort();
qDebug() << "Client disconnected"; qDebug() << "Client disconnected";
return; return;
@ -167,7 +167,7 @@ void RemoteClient::SendDataToClient(pb::remote::Message *msg) {
s << qint32(data.length()); s << qint32(data.length());
if (downloader_) { if (downloader_) {
// Don't use QDataSteam for large files // Don't use QDataSteam for large files
client_->write(data.data(), data.length()); client_->write(data.data(), data.length());;
} else { } else {
s.writeRawData(data.data(), data.length()); s.writeRawData(data.data(), data.length());
} }