process: Increase maximum argument size and report when running out of it.

Wallbraker · Wallbraker · commit 8ca0e944ad9e · 2018-08-16T15:03:13.000+01:00
diff --git a/src/watt/process/sink.volt b/src/watt/process/sink.volt
@@ -9,34 +9,38 @@ import io = watt.io;
 struct CStrSink
 {
 public:
-	strStorage: char[16*1024];
+	strStorage: char[256*1024];
 	ptrStorage: char*[4*1024];
 	strLoc: size_t;
 	ptrLoc: size_t;
 
 
 public:
-	fn addArgz(str: SinkArg)
+	fn addArgz(str: SinkArg) bool
 	{
 		len := str.length + 1;
 		if (!checkStorage(len)) {
-			return;
+			return false;
 		}
 
 		ptrStorage[ptrLoc++] = &strStorage.ptr[strLoc];
 		add(str, '\0');
+
+		return true;
 	}
 
-	fn addEnvz(key: SinkArg, value: SinkArg)
+	fn addEnvz(key: SinkArg, value: SinkArg) bool
 	{
 		len := key.length + 1 + value.length + 1;
 		if (!checkStorage(len)) {
-			return;
+			return false;
 		}
 
 		ptrStorage[ptrLoc++] = &strStorage.ptr[strLoc];
 		add(key, '=');
 		add(value, '\0');
+
+		return true;
 	}
 
 
diff --git a/src/watt/process/spawn.volt b/src/watt/process/spawn.volt
@@ -270,17 +270,14 @@ version (Posix) {
 		argz: CStrSink;
 		envz: CStrSink;
 
-		if (env !is null) {
-			// Fill out the envz to be given to execve.
-			foreach (k, v; env.store) {
-				envz.addEnvz(k, v);
-			}
+		// Fill out the envz to be given to execve, null safe.
+		if (!envz.toEnvz(env)) {
+			throw new ProcessException("Environment to large");
 		}
 
 		// Setup the argz to be given to execv[e].
-		argz.addArgz(name);
-		foreach (arg; args) {
-			argz.addArgz(arg);
+		if (!argz.toArgz(name, args)) {
+			throw new ProcessException("Out of argument memory");
 		}
 
 		pid := fork();
@@ -366,6 +363,37 @@ version (Posix) {
 		}
 	}
 
+	private fn toArgz(ref argz: CStrSink, name: string, args: string[]) bool
+	{
+		if (!argz.addArgz(name)) {
+			return false;
+		}
+
+		foreach (arg; args) {
+			if (!argz.addArgz(arg)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	private fn toEnvz(ref envz: CStrSink, env: Environment) bool
+	{
+		if (env is null) {
+			return true;
+		}
+
+		// Fill out the envz to be given to execve.
+		foreach (k, v; env.store) {
+			if (!envz.addEnvz(k, v)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	private fn stopped(status: i32) bool { return (status & 0xff) == 0x7f; }
 	private fn signaled(status: i32) bool { return ((((status & 0x7f) + 1) & 0xff) >> 1) > 0; }
 	private fn exited(status: i32) bool { return (status & 0x7f) == 0; }
@@ -374,6 +402,7 @@ version (Posix) {
 	private fn exitstatus(status: i32) i32 { return (status & 0xff00) >> 8; }
 
 } else version (Windows) {
+
 	private fn toArgz(moduleName: string, args: string[]) LPSTR
 	{
 		buffer: StringSink;

Original file line number	Diff line number	Diff line change
`@@ -9,34 +9,38 @@ import io = watt.io;`
`9`	`9`	`struct CStrSink`
`10`	`10`	`{`
`11`	`11`	`public:`
`12`		`- strStorage: char[16*1024];`
	`12`	`+ strStorage: char[256*1024];`
`13`	`13`	`ptrStorage: char[41024];`
`14`	`14`	`strLoc: size_t;`
`15`	`15`	`ptrLoc: size_t;`
`16`	`16`
`17`	`17`
`18`	`18`	`public:`
`19`		`- fn addArgz(str: SinkArg)`
	`19`	`+ fn addArgz(str: SinkArg) bool`
`20`	`20`	`{`
`21`	`21`	`len := str.length + 1;`
`22`	`22`	`if (!checkStorage(len)) {`
`23`		`- return;`
	`23`	`+ return false;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`ptrStorage[ptrLoc++] = &strStorage.ptr[strLoc];`
`27`	`27`	`add(str, '\0');`
	`28`	`+`
	`29`	`+ return true;`
`28`	`30`	`}`
`29`	`31`
`30`		`- fn addEnvz(key: SinkArg, value: SinkArg)`
	`32`	`+ fn addEnvz(key: SinkArg, value: SinkArg) bool`
`31`	`33`	`{`
`32`	`34`	`len := key.length + 1 + value.length + 1;`
`33`	`35`	`if (!checkStorage(len)) {`
`34`		`- return;`
	`36`	`+ return false;`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`ptrStorage[ptrLoc++] = &strStorage.ptr[strLoc];`
`38`	`40`	`add(key, '=');`
`39`	`41`	`add(value, '\0');`
	`42`	`+`
	`43`	`+ return true;`
`40`	`44`	`}`
`41`	`45`
`42`	`46`