- Fix off by one error in allocating command line (by Shane)

Andi Gutmans · Andi Gutmans · commit 6f3f47eaa945 · 2001-07-07T20:00:35.000Z
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
@@ -135,7 +135,7 @@ TSRM_API FILE* popen(const char *command, const char *type)
 		startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
 	}
 
-	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+4);
+	cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c "));
 	sprintf(cmd, "%s /c %s", TWG(comspec), command);
 	if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &process)) {
 		return NULL;
@@ -184,4 +184,4 @@ TSRM_API int pclose(FILE* stream)
 	return termstat;
 }
 
-#endif
+#endif

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ TSRM_API FILE* popen(const char command, const char type)`
`135`	`135`	`startup.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);`
`136`	`136`	`}`
`137`	`137`
`138`		`- cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+4);`
	`138`	`+ cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof(" /c "));`
`139`	`139`	`sprintf(cmd, "%s /c %s", TWG(comspec), command);`
`140`	`140`	`if (!CreateProcess(NULL, cmd, &security, &security, security.bInheritHandle, NORMAL_PRIORITY_CLASS, NULL, NULL, &startup, &process)) {`
`141`	`141`	`return NULL;`
`@@ -184,4 +184,4 @@ TSRM_API int pclose(FILE* stream)`
`184`	`184`	`return termstat;`
`185`	`185`	`}`
`186`	`186`
`187`		`-#endif`
	`187`	`+#endif`