Merge pull request livecode#3524 from peter-b/js/check-env-null

peter-b · peter-b · commit 233582f3c956 · 2016-01-28T08:57:15.000Z
[emscripten] Only import environment array if non-null.
diff --git a/engine/src/em-main.cpp b/engine/src/em-main.cpp
@@ -91,7 +91,7 @@ platform_main(int argc, char *argv[], char *envp[])
 	/* ---------- Process the environment */
 	/* Count env variables */
 	int t_envc;
-	for (t_envc = 0; envp[t_envc] != nil; ++t_envc);
+	for (t_envc = 0; envp != nil && envp[t_envc] != nil; ++t_envc);
 
 	/* Import. Note that the envp array is null-terminated */
 	MCStringRef *t_envp;
