mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-28 11:25:35 +02:00
Code Issues Wiki Activity

Removes command line length limitation, bug 138444.

Browse source
This commit is contained in:
Markus Schorn 2006-04-27 16:20:53 +00:00
parent 8272805b36
commit 258e48d547
2 changed files with 113 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
core/org.eclipse.cdt.core.win32/library/Win32ProcessEx.c
View file

@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - initial API and implementation * QNX Software Systems - initial API and implementation
* Wind River Systems, Inc.
* *
* Win32ProcessEx.c * Win32ProcessEx.c
* *
@ -24,7 +25,7 @@
#define PIPE_SIZE 512 // Size of pipe buffer #define PIPE_SIZE 512 // Size of pipe buffer
#define MAX_CMD_SIZE 2049 // Maximum size of command line #define MAX_CMD_SIZE 2049 // Initial size of command line
#define MAX_ENV_SIZE 4096 // Initial size of environment block #define MAX_ENV_SIZE 4096 // Initial size of environment block
#define PIPE_NAME_LENGTH 100 // Size of pipe name buffer #define PIPE_NAME_LENGTH 100 // Size of pipe name buffer
#define PIPE_TIMEOUT 10000 // Default time-out value, in milliseconds. #define PIPE_TIMEOUT 10000 // Default time-out value, in milliseconds.
@ -102,6 +103,24 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec2
return -1; return -1;
} }
void ensureSize(_TCHAR** ptr, int* psize, int requiredLength)
{
int size= *psize;
if (requiredLength > size) {
size= 2*size;
if (size < requiredLength) {
size= requiredLength;
}
*ptr= (_TCHAR *)realloc(*ptr, size * sizeof(_TCHAR));
if (NULL == *ptr) {
*psize= 0;
}
else {
*psize= size;
}
}
}
JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0 JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
(JNIEnv * env, jobject process, jobjectArray cmdarray, jobjectArray envp, jstring dir, jintArray channels) (JNIEnv * env, jobject process, jobjectArray cmdarray, jobjectArray envp, jstring dir, jintArray channels)
{ {
@ -112,7 +131,8 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
const _TCHAR * cwd = NULL; const _TCHAR * cwd = NULL;
LPVOID envBlk = NULL; LPVOID envBlk = NULL;
int ret = 0; int ret = 0;
_TCHAR szCmdLine[MAX_CMD_SIZE]; int nCmdLineLength= 0;
_TCHAR * szCmdLine= 0;
int nBlkSize = MAX_ENV_SIZE; int nBlkSize = MAX_ENV_SIZE;
_TCHAR * szEnvBlock = NULL; _TCHAR * szEnvBlock = NULL;
jsize nCmdTokens = 0; jsize nCmdTokens = 0;
@ -133,6 +153,9 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
_TCHAR outPipeName[PIPE_NAME_LENGTH]; _TCHAR outPipeName[PIPE_NAME_LENGTH];
_TCHAR errPipeName[PIPE_NAME_LENGTH]; _TCHAR errPipeName[PIPE_NAME_LENGTH];
nCmdLineLength= MAX_CMD_SIZE;
szCmdLine= (_TCHAR *)malloc(nCmdLineLength * sizeof(_TCHAR));
szCmdLine[0]= _T('\0');
if((HIBYTE(LOWORD(GetVersion()))) & 0x80) if((HIBYTE(LOWORD(GetVersion()))) & 0x80)
{ {
ThrowByName(env, "java/io/IOException", "Does not support Windows 3.1/95/98/Me"); ThrowByName(env, "java/io/IOException", "Does not support Windows 3.1/95/98/Me");
@ -212,9 +235,20 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
const _TCHAR * str = (*env) -> GetStringChars(env, item, 0); const _TCHAR * str = (*env) -> GetStringChars(env, item, 0);
if(NULL != str) if(NULL != str)
{ {
if(0 > (nCpyLen = copyTo(szCmdLine + nPos, str, len, MAX_CMD_SIZE - nPos))) int requiredSize= nPos+len+2;
if (requiredSize > 32*1024) {
ThrowByName(env, "java/io/IOException", "Command line too long");
return 0;
}
ensureSize(&szCmdLine, &nCmdLineLength, requiredSize);
if (NULL == szCmdLine) {
ThrowByName(env, "java/io/IOException", "Not enough memory");
return 0;
}
if(0 > (nCpyLen = copyTo(szCmdLine + nPos, str, len, nCmdLineLength - nPos)))
{ {
ThrowByName(env, "java/io/IOException", "Too long command line"); ThrowByName(env, "java/io/IOException", "Command line too long");
return 0; return 0;
} }
nPos += nCpyLen; nPos += nCpyLen;
@ -223,7 +257,6 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
(*env) -> ReleaseStringChars(env, item, str); (*env) -> ReleaseStringChars(env, item, str);
} }
} }
szCmdLine[nPos] = _T('\0'); szCmdLine[nPos] = _T('\0');
@ -316,18 +349,18 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0
&si, /* (in) startup information */ &si, /* (in) startup information */
&pi); /* (out) process information */ &pi); /* (out) process information */
if(NULL != cwd) if(NULL != cwd)
free((void *)cwd); free((void *)cwd);
if(NULL != szEnvBlock) if(NULL != szEnvBlock)
free(szEnvBlock); free(szEnvBlock);
if(NULL != szCmdLine)
free(szCmdLine);
if (!ret) // Launching error if (!ret) // Launching error
{ {
char * lpMsgBuf; char * lpMsgBuf;
CloseHandle(stdHandles[0]); CloseHandle(stdHandles[0]);
CloseHandle(stdHandles[1]); CloseHandle(stdHandles[1]);
CloseHandle(stdHandles[2]); CloseHandle(stdHandles[2]);
@ -423,10 +456,14 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec1
jsize nEnvVars = 0; jsize nEnvVars = 0;
int i; int i;
int nPos; int nPos;
_TCHAR szCmdLine[MAX_CMD_SIZE]; int nCmdLineLength= 0;
_TCHAR * szCmdLine= 0;
int nBlkSize = MAX_ENV_SIZE; int nBlkSize = MAX_ENV_SIZE;
_TCHAR * szEnvBlock = NULL; _TCHAR * szEnvBlock = NULL;
nCmdLineLength= MAX_CMD_SIZE;
szCmdLine= (_TCHAR *)malloc(nCmdLineLength * sizeof(_TCHAR));
szCmdLine[0]= 0;
sa.nLength = sizeof(sa); sa.nLength = sizeof(sa);
sa.lpSecurityDescriptor = 0; sa.lpSecurityDescriptor = 0;
@ -447,9 +484,20 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec1
const _TCHAR * str = (*env) -> GetStringChars(env, item, 0); const _TCHAR * str = (*env) -> GetStringChars(env, item, 0);
if(NULL != str) if(NULL != str)
{ {
if(0 > (nCpyLen = copyTo(szCmdLine + nPos, str, len, MAX_CMD_SIZE - nPos))) int requiredSize= nPos+len+2;
if (requiredSize > 32*1024) {
ThrowByName(env, "java/io/IOException", "Command line too long");
return 0;
}
ensureSize(&szCmdLine, &nCmdLineLength, requiredSize);
if (NULL == szCmdLine) {
ThrowByName(env, "java/io/IOException", "Not enough memory");
return 0;
}
if(0 > (nCpyLen = copyTo(szCmdLine + nPos, str, len, nCmdLineLength - nPos)))
{ {
ThrowByName(env, "java/io/Exception", "Too long command line"); ThrowByName(env, "java/io/Exception", "Command line too long");
return 0; return 0;
} }
nPos += nCpyLen; nPos += nCpyLen;
@ -516,7 +564,6 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec1
flags = CREATE_NEW_CONSOLE; flags = CREATE_NEW_CONSOLE;
flags |= CREATE_UNICODE_ENVIRONMENT; flags |= CREATE_UNICODE_ENVIRONMENT;
ret = CreateProcessW(0, /* executable name */ ret = CreateProcessW(0, /* executable name */
szCmdLine, /* command line */ szCmdLine, /* command line */
0, /* process security attribute */ 0, /* process security attribute */
@ -534,6 +581,8 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec1
free(cwd); free(cwd);
if(NULL != szEnvBlock) if(NULL != szEnvBlock)
free(szEnvBlock); free(szEnvBlock);
if(NULL != szCmdLine)
free(szCmdLine);
if (!ret) // error if (!ret) // error
{ {

44
core/org.eclipse.cdt.core.win32/library/starter/starter.cpp
View file

@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - initial API and implementation * QNX Software Systems - initial API and implementation
* Wind River Systems, Inc.
* *
* starter.cpp * starter.cpp
* *
@ -55,6 +56,23 @@ BOOL WINAPI HandlerRoutine( DWORD dwCtrlType) // control signal type
return ret; return ret;
} }
void ensureSize(_TCHAR** ptr, int* psize, int requiredLength)
{
int size= *psize;
if (requiredLength > size) {
size= 2*size;
if (size < requiredLength) {
size= requiredLength;
}
*ptr= (_TCHAR *)realloc(*ptr, size * sizeof(_TCHAR));
if (NULL == *ptr) {
*psize= 0;
}
else {
*psize= size;
}
}
}
extern "C" int _tmain(int argc, _TCHAR * argv[]) { extern "C" int _tmain(int argc, _TCHAR * argv[]) {
@ -67,13 +85,30 @@ extern "C" int _tmain(int argc, _TCHAR * argv[]) {
} }
// Construct the full command line // Construct the full command line
_TCHAR szCmdLine[MAX_CMD_LINE_LENGTH] = { 0 }; int nCmdLineLength= MAX_CMD_LINE_LENGTH;
_TCHAR * szCmdLine= (_TCHAR *)malloc(nCmdLineLength * sizeof(_TCHAR));
szCmdLine[0]= 0;
int nPos = 0; int nPos = 0;
for(int i = 6; i < argc; ++i) for(int i = 6; i < argc; ++i)
{ {
int nCpyLen; int nCpyLen;
if(0 > (nCpyLen = copyTo(szCmdLine + nPos, argv[i], _tcslen(argv[i]), MAX_CMD_LINE_LENGTH - nPos))) int len= _tcslen(argv[i]);
int requiredSize= nPos+len+2;
if (requiredSize > 32*1024) {
#ifdef DEBUG_MONITOR
OutputDebugStringW(_T("Command line too long!\n"));
#endif
return 0;
}
ensureSize(&szCmdLine, &nCmdLineLength, requiredSize);
if (NULL == szCmdLine) {
#ifdef DEBUG_MONITOR
OutputDebugStringW(_T("Not enough memory to build cmd line!\n"));
#endif
return 0;
}
if(0 > (nCpyLen = copyTo(szCmdLine + nPos, argv[i], len, nCmdLineLength - nPos)))
{ {
#ifdef DEBUG_MONITOR #ifdef DEBUG_MONITOR
OutputDebugStringW(_T("Not enough space to build command line\n")); OutputDebugStringW(_T("Not enough space to build command line\n"));
@ -290,6 +325,11 @@ extern "C" int _tmain(int argc, _TCHAR * argv[]) {
#endif #endif
} }
if (NULL != szCmdLine)
{
free(szCmdLine);
}
CloseHandle(waitEvent); CloseHandle(waitEvent);
CloseHandle(h[0]); CloseHandle(h[0]);
CloseHandle(h[1]); CloseHandle(h[1]);