safety guard at startup, not during request time

(unless placeholders are used, bad idea anyway)

Author: henderkes

requestoptions.go

@@ -130,13 +130,38 @@ func WithRequestEnv(env map[string]string) RequestOption {
 }
 
 func WithRequestPreparedEnv(env PreparedEnv) RequestOption {
+	env = ensurePreparedEnv(env)
+
 	return func(o *frankenPHPContext) error {
 		o.env = env
 
 		return nil
 	}
 }
 
+// ensurePreparedEnv ensures every key is NUL-terminated
+// Empty keys are dropped
+func ensurePreparedEnv(env PreparedEnv) PreparedEnv {
+	for k := range env {
+		if k == "" || k[len(k)-1] != '\x00' {
+			fixed := make(PreparedEnv, len(env))
+			for k, v := range env {
+				if k == "" {
+					continue
+				}
+				if k[len(k)-1] != '\x00' {
+					k += "\x00"
+				}
+				fixed[k] = v
+			}
+
+			return fixed
+		}
+	}
+
+	return env
+}
+
 func WithOriginalRequest(r *http.Request) RequestOption {
 	return func(o *frankenPHPContext) error {
 		o.originalRequest = r