Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2011-04-13 15:11:42 -0400
committerAndrew Niefer2011-04-13 15:11:42 -0400
commitce468308b15ab7e29c3867570417067ed36d1fc0 (patch)
treefe7e9f57907ad80f5bd251903b0bc1023a672d53
parente2ee3856e52038903c914a1551bc4cfe03a2c334 (diff)
downloadrt.equinox.framework-ce468308b15ab7e29c3867570417067ed36d1fc0.tar.gz
rt.equinox.framework-ce468308b15ab7e29c3867570417067ed36d1fc0.tar.xz
rt.equinox.framework-ce468308b15ab7e29c3867570417067ed36d1fc0.zip
Bug 342748 - [launcher] Crash in formatVmCommandMsg
-rw-r--r--bundles/org.eclipse.equinox.executable/library/eclipse.c4
-rw-r--r--bundles/org.eclipse.equinox.executable/library/make_version.mak2
2 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipse.c b/bundles/org.eclipse.equinox.executable/library/eclipse.c
index c4d94233d..cdb532863 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipse.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipse.c
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -905,7 +905,7 @@ static _TCHAR* formatVmCommandMsg( _TCHAR* args[], _TCHAR* vmArgs[], _TCHAR* pr
while(list != NULL) {
for (index = 0; list[index] != NULL; index++)
{
- if (list[index][0] == _T_ECLIPSE('-') && *(ch-1) == _T_ECLIPSE(' '))
+ if (ch != message && list[index][0] == _T_ECLIPSE('-') && *(ch-1) == _T_ECLIPSE(' '))
*(ch-1) = _T_ECLIPSE('\n');
_tcscpy( ch, list[index] );
ch += _tcslen( list[index] );
diff --git a/bundles/org.eclipse.equinox.executable/library/make_version.mak b/bundles/org.eclipse.equinox.executable/library/make_version.mak
index 4f7226258..2ce3e69c4 100644
--- a/bundles/org.eclipse.equinox.executable/library/make_version.mak
+++ b/bundles/org.eclipse.equinox.executable/library/make_version.mak
@@ -10,5 +10,5 @@
#*******************************************************************************
maj_ver=1
-min_ver=118
+min_ver=119
LIB_VERSION = $(maj_ver)$(min_ver)

Back to the top