jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 19:47:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix memory leaks from DeckLoader usage (#5665)

Browse source 
* add comment

* stack allocate DeckLoader for loading tags

* deckModel now takes ownership of DeckLoader

* fix remaining

* add comment
This commit is contained in:
RickyRister 2025-03-02 15:57:30 -08:00 • committed by GitHub
parent 87c5d07807
commit e1964f21de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp
View file

@ -63,13 +63,14 @@ void DlgLoadDeckFromClipboard::actOK()
QTextStream stream(&buffer);
auto *deckLoader = new DeckLoader;
deckLoader->setParent(this);
if (buffer.contains("<cockatrice_deck version=\"1\">")) {
if (deckLoader->loadFromString_Native(buffer)) {
deckList = deckLoader;
accept();
} else {
QMessageBox::critical(this, tr("Error"), tr("Invalid deck list."));
delete deckLoader;
}
} else if (deckLoader->loadFromStream_Plain(stream)) {
deckList = deckLoader;
@ -81,7 +82,6 @@ void DlgLoadDeckFromClipboard::actOK()
accept();
} else {
QMessageBox::critical(this, tr("Error"), tr("Invalid deck list."));
delete deckLoader;
}
}

8
cockatrice/src/dialogs/dlg_load_deck_from_clipboard.h
View file

@ -24,6 +24,14 @@ private:
public:
explicit DlgLoadDeckFromClipboard(QWidget *parent = nullptr);
/**
* Gets the loaded deck. Only call this method after this dialog window has been successfully exec'd.
*
* The returned DeckLoader is parented to this object; make sure to take ownership of the DeckLoader if you intend
* to use it, since otherwise it will get destroyed once this dlg is destroyed
* @return The DeckLoader
*/
DeckLoader *getDeckList() const
{
return deckList;