Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2008-04-25 14:19:03 -0400
committerAndrew Niefer2008-04-25 14:19:03 -0400
commitc6713b4be5a912de494efd86d53192285bdee586 (patch)
treec3b3b213b7859c9980e0f735113ed65631485f93
parent76e41f80a8ecc14e610a3c04a680a8c6d0127d60 (diff)
downloadrt.equinox.framework-c6713b4be5a912de494efd86d53192285bdee586.tar.gz
rt.equinox.framework-c6713b4be5a912de494efd86d53192285bdee586.tar.xz
rt.equinox.framework-c6713b4be5a912de494efd86d53192285bdee586.zip
bug 228785 - empty path
-rw-r--r--bundles/org.eclipse.equinox.executable/library/eclipseCommon.c2
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/eclipseCommon.c b/bundles/org.eclipse.equinox.executable/library/eclipseCommon.c
index 01103a60f..77e1a5b07 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipseCommon.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipseCommon.c
@@ -223,6 +223,8 @@ _TCHAR* findSymlinkCommand( _TCHAR* command, int resolve )
path = _tgetenv( _T_ECLIPSE("PATH") );
#ifdef _WIN32
/* on windows, prepend the current directory */
+ if (path == NULL)
+ path = _T_ECLIPSE("");
ch = malloc((_tcslen(path) + MAX_PATH_LENGTH + 2) * sizeof(_TCHAR));
_tgetcwd( ch, MAX_PATH_LENGTH );
length = _tcslen(ch);
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
index ea9d8011a..afd3dbbce 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
+++ b/bundles/org.eclipse.equinox.executable/library/motif/eclipseMotif.c
@@ -289,6 +289,8 @@ int launchJavaVM( char* args[] )
{
/* put the root of eclipse on the LD_LIBRARY_PATH */
char * ldPath = (char*)getenv(_T_ECLIPSE("LD_LIBRARY_PATH"));
+ if (ldPath == NULL)
+ ldPath = _T_ECLIPSE("");
char * root = getProgramDir();
if (root != NULL) {
char * newPath = malloc((strlen(root) + strlen(ldPath) + 2) * sizeof(char));

Back to the top