fix memory leak in cert wizard, null-check, dbgoutput before hard-fail

mumble-voip · Apr 13, 2013 · e58aa08 · hacst · Apr 22, 2013 · Kissaki
1 parent 3c5976d
commit e58aa08
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp
@@ -81,6 +81,13 @@ CertView::CertView(QWidget *p) : QGroupBox(p) {
 	grid->setColumnStretch(1, 1);
 }
 
+CertView::~CertView() {
+	delete qlSubjectName;
+	delete qlSubjectEmail;
+	delete qlIssuerName;
+	delete qlExpiry;
+}
+
 void CertView::setCert(const QList<QSslCertificate> &cert) {
 	qlCert = cert;
 

diff --git a/src/mumble/Cert.h b/src/mumble/Cert.h
@@ -50,6 +50,7 @@ class CertView : public QGroupBox {
 		QLabel *qlSubjectName, *qlSubjectEmail, *qlIssuerName, *qlExpiry;
 	public:
 		CertView(QWidget *p);
+		virtual ~CertView();
 		void setCert(const QList<QSslCertificate> &cert);
 };
 

diff --git a/src/mumble/ConfigDialog.cpp b/src/mumble/ConfigDialog.cpp
@@ -42,10 +42,12 @@ ConfigDialog::ConfigDialog(QWidget *p) : QDialog(p) {
 
 	s = g.s;
 
-	unsigned int idx = 0;
-	ConfigWidgetNew cwn;
-	foreach(cwn, *ConfigRegistrar::c_qmNew) {
-		addPage(cwn(s), ++idx);
+	if (ConfigRegistrar::c_qmNew) {
+		unsigned int idx = 0;
+		ConfigWidgetNew cwn;
+		foreach(cwn, *ConfigRegistrar::c_qmNew) {
+			addPage(cwn(s), ++idx);
+		}
 	}
 
 	qcbExpert->setChecked(g.s.bExpert);

diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp
@@ -78,6 +78,7 @@ ServerDB::ServerDB() {
 	}
 	if (db) {
 		// Don’t hide away our previous instance. Fail hard.
+		OutputDebugStringA("ServerDB has already been instantiated!");
 		throw std::exception();
 	}
 	db = new QSqlDatabase(QSqlDatabase::addDatabase(Meta::mp.qsDBDriver));