DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix mem crash, leak

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-10-15 14:44:33 -07:00
parent 306c39bb09
commit 12f126bd28
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@@ -13,14 +13,12 @@ src/ui_*.h
src/precompiled.h.cpp src/precompiled.h.cpp
.qmake.stash .qmake.stash
zecwallet zecwallet
zec-qt-wallet
zec-qt-wallet.app
ZecWallet.app ZecWallet.app
zec-qt-wallet-mingw* zecwallet-lite-mingw*
zec-qt-wallet.vcxproj* zecwallet-lite.vcxproj*
zecwallet.vcxproj* zecwallet.vcxproj*
zec-qt-wallet.sln zecwallet-lite.sln
zec-qt-wallet.pro.user zecwallet-lite.pro.user
/Makefile /Makefile
/Makefile.* /Makefile.*
qrc_application.cpp qrc_application.cpp

19
src/connection.cpp
View File

@@ -23,8 +23,8 @@ ConnectionLoader::ConnectionLoader(MainWindow* main, Controller* rpc) {
} }
ConnectionLoader::~ConnectionLoader() { ConnectionLoader::~ConnectionLoader() {
delete d;
delete connD; delete connD;
delete d;
} }
void ConnectionLoader::loadConnection() { void ConnectionLoader::loadConnection() {
@@ -34,6 +34,8 @@ void ConnectionLoader::loadConnection() {
} }
void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) { void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) {
qDebug() << "Doing autoconnect";
auto config = std::shared_ptr<ConnectionConfig>(new ConnectionConfig()); auto config = std::shared_ptr<ConnectionConfig>(new ConnectionConfig());
config->dangerous = true; config->dangerous = true;
config->server = QString("https://127.0.0.1:9067"); config->server = QString("https://127.0.0.1:9067");
@@ -46,7 +48,6 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) {
// After the lib is initialized, try to do get info // After the lib is initialized, try to do get info
connection->doRPC("info", "", [=](auto reply) { connection->doRPC("info", "", [=](auto reply) {
// If success, set the connection // If success, set the connection
d->hide();
main->logger->write("Connection is online."); main->logger->write("Connection is online.");
this->doRPCSetConnection(connection); this->doRPCSetConnection(connection);
}, [=](auto err, auto errJson) {}); }, [=](auto err, auto errJson) {});
@@ -57,7 +58,7 @@ void ConnectionLoader::doRPCSetConnection(Connection* conn) {
d->accept(); d->accept();
delete this; QTimer::singleShot(1, [=]() { delete this; });
} }
Connection* ConnectionLoader::makeConnection(std::shared_ptr<ConnectionConfig> config) { Connection* ConnectionLoader::makeConnection(std::shared_ptr<ConnectionConfig> config) {
@@ -97,9 +98,17 @@ void ConnectionLoader::showError(QString explanation) {
void Executor::run() { void Executor::run() {
char* resp = litelib_execute(this->cmd.toStdString().c_str()); char* resp = litelib_execute(this->cmd.toStdString().c_str());
QString reply = QString::fromStdString(resp);
// Copy the string, since we need to return this back to rust
char* resp_copy = new char[strlen(resp) + 1];
strcpy(resp_copy, resp);
litelib_rust_free_string(resp); litelib_rust_free_string(resp);
QString reply = QString::fromStdString(resp_copy);
memset(resp_copy, '-', strlen(resp_copy));
delete[] resp_copy;
qDebug() << "Reply=" << reply;
auto parsed = json::parse(reply.toStdString().c_str(), nullptr, false); auto parsed = json::parse(reply.toStdString().c_str(), nullptr, false);
emit responseReady(parsed); emit responseReady(parsed);
@@ -130,7 +139,7 @@ void Connection::doRPC(const QString cmd, const QString args, const std::functio
QObject::connect(runner, &Executor::responseReady, [=] (json resp) { QObject::connect(runner, &Executor::responseReady, [=] (json resp) {
cb(resp); cb(resp);
}); });
QThreadPool::globalInstance()->start(runner); QThreadPool::globalInstance()->start(runner);
} }