From 2ad5f1cb407f00f5159809b8f8811c8e4ca2b067 Mon Sep 17 00:00:00 2001 From: lotodore Date: Mon, 28 Feb 2011 19:59:14 +0000 Subject: [PATCH] Fixing possible memory leak and compiler warnings. --- src/core/common/crypthelper.cpp | 1 + src/game.cpp | 6 +++--- src/gui/qt/gametable/gametableimpl.cpp | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/core/common/crypthelper.cpp b/src/core/common/crypthelper.cpp index 4dfe06df..27c01e14 100644 --- a/src/core/common/crypthelper.cpp +++ b/src/core/common/crypthelper.cpp @@ -299,6 +299,7 @@ CryptHelper::AES128Encrypt(const unsigned char *keyData, unsigned keySize, const gcry_cipher_close(hd); #endif + delete[] paddedPlainStr; } return retVal; } diff --git a/src/game.cpp b/src/game.cpp index da217d5f..556827a2 100755 --- a/src/game.cpp +++ b/src/game.cpp @@ -68,9 +68,9 @@ Game::Game(GuiInterface* gui, boost::shared_ptr factory, currentBoard = myFactory->createBoard(dealerPosition); // create player lists - seatsList = PlayerList(new std::list >); - activePlayerList = PlayerList(new std::list >); - runningPlayerList = PlayerList(new std::list >); + seatsList.reset(new std::list >); + activePlayerList.reset(new std::list >); + runningPlayerList.reset(new std::list >); // create player player_i = playerDataList.begin(); diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 514d1b34..fe223f9a 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -2966,7 +2966,7 @@ void gameTableImpl::changePlayingMode() } - switch (mode) { +/* switch (mode) { // case 0: { statusBar()->showMessage(tr("Manual mode set. You've got to choose yourself now."), 5000); } break; @@ -2975,10 +2975,10 @@ void gameTableImpl::changePlayingMode() // case 2: { statusBar()->showMessage(tr("Auto mode set: Check or fold."), 5000); } break; default: { - /*cout << "changePlayingMode ERROR!!!!" << endl;*/ + //cout << "changePlayingMode ERROR!!!!" << endl; } - } + }*/ playingMode = mode; }