fixed few memory leaks

prevent db helper functions from returning uninitialized ptr

git-svn-id: http://svn.miranda-ng.org/main/trunk@5543 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 10 insertions, 4 deletions

diff --git a/plugins/Watrack_MPD/src/options.cpp b/plugins/Watrack_MPD/src/options.cpp
index 9d9d755f8c..a3cc00d498 100755
--- a/plugins/Watrack_MPD/src/options.cpp
+++ b/plugins/Watrack_MPD/src/options.cpp
@@ -24,8 +24,12 @@ static INT_PTR CALLBACK DlgProcWaMpdOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
     {
 		TranslateDialogDefault(hwndDlg);
 		SetDlgItemInt(hwndDlg, IDC_PORT, db_get_w(NULL, szModuleName, "Port", 6600), FALSE);
-		SetDlgItemText(hwndDlg, IDC_SERVER, UniGetContactSettingUtf(NULL, szModuleName, "Server", _T("127.0.0.1")));
-		SetDlgItemText(hwndDlg, IDC_PASSWORD, UniGetContactSettingUtf(NULL, szModuleName, "Password", _T("")));
+		TCHAR *tmp = UniGetContactSettingUtf(NULL, szModuleName, "Server", _T("127.0.0.1"));
+		SetDlgItemText(hwndDlg, IDC_SERVER, tmp);
+		mir_free(tmp);
+		tmp = UniGetContactSettingUtf(NULL, szModuleName, "Password", _T(""));
+		SetDlgItemText(hwndDlg, IDC_PASSWORD, tmp);
+		mir_free(tmp);
       return TRUE;
     }
     
diff --git a/plugins/Watrack_MPD/src/utilities.cpp b/plugins/Watrack_MPD/src/utilities.cpp
index fc5e621837..05c5d2f1b4 100755
--- a/plugins/Watrack_MPD/src/utilities.cpp
+++ b/plugins/Watrack_MPD/src/utilities.cpp
@@ -20,11 +20,13 @@
 TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef)
 {
   DBVARIANT dbv = {DBVT_DELETED};
-  TCHAR* szRes;
+  TCHAR* szRes = NULL;
   if (db_get_ts(hContact, szModule, szSetting, &dbv))
 	 return _tcsdup(szDef);
-  if(dbv.pszVal)
+  else if(dbv.pszVal)
 	  szRes = _tcsdup(dbv.ptszVal);
+  else
+	  szRes = _tcsdup(szDef);
   db_free(&dbv);
   return szRes;
 }