Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Magloire2002-11-19 18:53:30 +0000
committerAlain Magloire2002-11-19 18:53:30 +0000
commitbb4a4631b54dac6b104235c88d9c30769faba020 (patch)
tree07b5a9fdb22697ad18d95b0ad71bdcc66ffd77d3 /core/org.eclipse.cdt.core.win32/library
parent280c95fcfeaf9ac0a1a1a99fbe7cca0388ca0b76 (diff)
downloadorg.eclipse.cdt-bb4a4631b54dac6b104235c88d9c30769faba020.tar.gz
org.eclipse.cdt-bb4a4631b54dac6b104235c88d9c30769faba020.tar.xz
org.eclipse.cdt-bb4a4631b54dac6b104235c88d9c30769faba020.zip
Fixes from Alex
Diffstat (limited to 'core/org.eclipse.cdt.core.win32/library')
-rw-r--r--core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c88
1 files changed, 53 insertions, 35 deletions
diff --git a/core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c b/core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c
index 9cb396a04c3..1c7d9cd0455 100644
--- a/core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c
+++ b/core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c
@@ -22,7 +22,7 @@
#include "jni.h"
#include "io.h"
-#define DEBUG_MONITOR
+// #define DEBUG_MONITOR
#define PIPE_SIZE 512
#define MAX_CMD_SIZE 1024
@@ -156,15 +156,18 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
jsize len = (*env) -> GetStringUTFLength(env, item);
int nCpyLen;
const char * str = (*env) -> GetStringUTFChars(env, item, 0);
- if(0 > (nCpyLen = copyTo(szCmdLine + nPos, str, len, MAX_CMD_SIZE - nPos)))
+ if(NULL != str)
{
- ThrowByName(env, "java/Exception", "Too long command line");
- return 0;
+ if(0 > (nCpyLen = copyTo(szCmdLine + nPos, str, len, MAX_CMD_SIZE - nPos)))
+ {
+ ThrowByName(env, "java/Exception", "Too long command line");
+ return 0;
+ }
+ nPos += nCpyLen;
+ szCmdLine[nPos] = ' ';
+ ++nPos;
+ (*env) -> ReleaseStringUTFChars(env, item, str);
}
- nPos += nCpyLen;
- szCmdLine[nPos] = ' ';
- ++nPos;
- (*env) -> ReleaseStringUTFChars(env, item, str);
}
szCmdLine[nPos] = '\0';
@@ -178,15 +181,18 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
jsize len = (*env) -> GetStringUTFLength(env, item);
int nCpyLen;
const char * str = (*env) -> GetStringUTFChars(env, item, 0);
- if(0 > (nCpyLen = copyTo(szEnvBlock + nPos, str, len, MAX_ENV_SIZE - nPos - 1)))
+ if(NULL != str)
{
- ThrowByName(env, "java/Exception", "Too many environment variables");
- return 0;
+ if(0 > (nCpyLen = copyTo(szEnvBlock + nPos, str, len, MAX_ENV_SIZE - nPos - 1)))
+ {
+ ThrowByName(env, "java/Exception", "Too many environment variables");
+ return 0;
+ }
+ nPos += nCpyLen;
+ szEnvBlock[nPos] = '\0';
+ ++nPos;
+ (*env) -> ReleaseStringUTFChars(env, item, str);
}
- nPos += nCpyLen;
- szEnvBlock[nPos] = '\0';
- ++nPos;
- (*env) -> ReleaseStringUTFChars(env, item, str);
}
szEnvBlock[nPos] = '\0';
envBlk = szEnvBlock;
@@ -196,9 +202,12 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
if (dir != 0)
{
- const char * str = NULL;
- cwd = strdup((*env) -> GetStringUTFChars(env, dir, 0));
- (*env) -> ReleaseStringUTFChars(env, dir, str);
+ const char * str = (*env) -> GetStringUTFChars(env, dir, 0);
+ if(NULL != str)
+ {
+ cwd = strdup(str);
+ (*env) -> ReleaseStringUTFChars(env, dir, str);
+ }
}
@@ -355,15 +364,18 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec1
jsize len = (*env) -> GetStringUTFLength(env, item);
int nCpyLen;
const char * str = (*env) -> GetStringUTFChars(env, item, 0);
- if(0 > (nCpyLen = copyTo(szCmdLine + nPos, str, len, MAX_CMD_SIZE - nPos)))
+ if(NULL != str)
{
- ThrowByName(env, "java/Exception", "Too long command line");
- return 0;
+ if(0 > (nCpyLen = copyTo(szCmdLine + nPos, str, len, MAX_CMD_SIZE - nPos)))
+ {
+ ThrowByName(env, "java/Exception", "Too long command line");
+ return 0;
+ }
+ nPos += nCpyLen;
+ szCmdLine[nPos] = ' ';
+ ++nPos;
+ (*env) -> ReleaseStringUTFChars(env, item, str);
}
- nPos += nCpyLen;
- szCmdLine[nPos] = ' ';
- ++nPos;
- (*env) -> ReleaseStringUTFChars(env, item, str);
}
szCmdLine[nPos] = '\0';
@@ -377,15 +389,18 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec1
jsize len = (*env) -> GetStringUTFLength(env, item);
int nCpyLen;
const char * str = (*env) -> GetStringUTFChars(env, item, 0);
- if(0 > (nCpyLen = copyTo(szEnvBlock + nPos, str, len, MAX_ENV_SIZE - nPos - 1)))
+ if(NULL != str)
{
- ThrowByName(env, "java/Exception", "Too many environment variables");
- return 0;
+ if(0 > (nCpyLen = copyTo(szEnvBlock + nPos, str, len, MAX_ENV_SIZE - nPos - 1)))
+ {
+ ThrowByName(env, "java/Exception", "Too many environment variables");
+ return 0;
+ }
+ nPos += nCpyLen;
+ szEnvBlock[nPos] = '\0';
+ ++nPos;
+ (*env) -> ReleaseStringUTFChars(env, item, str);
}
- nPos += nCpyLen;
- szEnvBlock[nPos] = '\0';
- ++nPos;
- (*env) -> ReleaseStringUTFChars(env, item, str);
}
szEnvBlock[nPos] = '\0';
envBlk = szEnvBlock;
@@ -395,9 +410,12 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec1
if (dir != 0)
{
- const char * str = NULL;
- cwd = strdup((*env) -> GetStringUTFChars(env, dir, 0));
- (*env) -> ReleaseStringUTFChars(env, dir, str);
+ const char * str = (*env) -> GetStringUTFChars(env, dir, 0);
+ if(NULL != str)
+ {
+ cwd = strdup(str);
+ (*env) -> ReleaseStringUTFChars(env, dir, str);
+ }
}

Back to the top