summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-11-13 19:16:08 +0100
committerKurt Zenker <kz@openoffice.org>2009-11-13 19:16:08 +0100
commit3415c114d2aa193052fcc7081d82965f1d9f9e5b (patch)
treef3d4d96a19cd11e2acfc8ba3cc811e2aac122b02
parent1ba50c661d7d338d6faaf11841df53e42381e40c (diff)
parent0d77960998216d8b4b06ae463ba176f9cb2d74f1 (diff)
CWS-TOOLING: integrate CWS cmcfixes66
Notes
split repo tag: filters_ooo/DEV300_m65
-rw-r--r--xmerge/source/activesync/XMergeFilter.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/xmerge/source/activesync/XMergeFilter.cpp b/xmerge/source/activesync/XMergeFilter.cpp
index ce1bc61cc58e..a02f11d03ad3 100644
--- a/xmerge/source/activesync/XMergeFilter.cpp
+++ b/xmerge/source/activesync/XMergeFilter.cpp
@@ -343,11 +343,6 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
DWORD dwClassName = _MAX_PATH;
DWORD dwKeyName = _MAX_PATH;
- // Locations shouldn't be greater than _MAX_PATH
- TCHAR* szJavaHome = new TCHAR[_MAX_PATH + 1];
- DWORD dwSize = _MAX_PATH + 1;
-
-
/*
* Java leaves registry keys at HKLM\SOFTWARE\JavaSoft.
*
@@ -357,6 +352,10 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
if (lRet != ERROR_SUCCESS)
return NULL;
+ // Locations shouldn't be greater than _MAX_PATH
+ TCHAR* szJavaHome = new TCHAR[_MAX_PATH + 1];
+ DWORD dwSize = _MAX_PATH + 1;
+
/* use current version */
lRet = ::RegQueryValueEx(hKey, _T("CurrentVersion"), 0, NULL, (LPBYTE)szCurrentJava, &dwSize);
@@ -376,6 +375,7 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
if (lRet != ERROR_SUCCESS)
{
RegCloseKey(hKey);
+ delete [] szJavaHome;
return NULL;
}
@@ -387,7 +387,7 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
{
RegCloseKey(hDataKey);
RegCloseKey(hKey);
- delete szJavaHome;
+ delete [] szJavaHome;
return NULL;
}
@@ -400,7 +400,7 @@ TCHAR* CXMergeFilter::GetJavaBaseDir()
if (((dwAttrs & FILE_ATTRIBUTE_DIRECTORY) != FILE_ATTRIBUTE_DIRECTORY) || dwAttrs == INVALID_FILE_SIZE)
{
- delete szJavaHome;
+ delete [] szJavaHome;
return NULL;
}