Fix command-line argv handling.

Author: Mike Pall

src/luajit.c

@@ -39,6 +39,7 @@
 
 static lua_State *globalL = NULL;
 static const char *progname = LUA_PROGNAME;
+static char *empty_argv[2] = { NULL, NULL };
 
 #if !LJ_TARGET_CONSOLE
 static void lstop(lua_State *L, lua_Debug *ar)
@@ -90,9 +91,9 @@ static void print_tools_usage(void)
   fflush(stderr);
 }
 
-static void l_message(const char *pname, const char *msg)
+static void l_message(const char *msg)
 {
-  if (pname) { fputs(pname, stderr); fputc(':', stderr); fputc(' ', stderr); }
+  if (progname) { fputs(progname, stderr); fputc(':', stderr); fputc(' ', stderr); }
   fputs(msg, stderr); fputc('\n', stderr);
   fflush(stderr);
 }
@@ -102,7 +103,7 @@ static int report(lua_State *L, int status)
   if (status && !lua_isnil(L, -1)) {
     const char *msg = lua_tostring(L, -1);
     if (msg == NULL) msg = "(error object is not a string)";
-    l_message(progname, msg);
+    l_message(msg);
     lua_pop(L, 1);
   }
   return status;
@@ -267,9 +268,8 @@ static void dotty(lua_State *L)
       lua_getglobal(L, "print");
       lua_insert(L, 1);
       if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != 0)
-	l_message(progname,
-	  lua_pushfstring(L, "error calling " LUA_QL("print") " (%s)",
-			      lua_tostring(L, -1)));
+	l_message(lua_pushfstring(L, "error calling " LUA_QL("print") " (%s)",
+				  lua_tostring(L, -1)));
     }
   }
   lua_settop(L, 0);  /* clear stack */
@@ -321,8 +321,7 @@ static int loadjitmodule(lua_State *L)
   lua_getfield(L, -1, "start");
   if (lua_isnil(L, -1)) {
   nomodule:
-    l_message(progname,
-	      "unknown luaJIT command or jit.* modules not installed");
+    l_message("unknown luaJIT command or jit.* modules not installed");
     return 1;
   }
   lua_remove(L, -2);  /* Drop module table. */
@@ -382,7 +381,7 @@ static int runtoolcmd(lua_State *L, const char *tool_name)
     if (msg) {
       if (!strncmp(msg, "module ", 7))
 	msg = "unknown luaJIT command or tools not installed";
-      l_message(progname, msg);
+      l_message(msg);
     }
     return 1;
   }
@@ -566,7 +565,6 @@ static int pmain(lua_State *L)
   int argn;
   int flags = 0;
   globalL = L;
-  if (argv[0] && argv[0][0]) progname = argv[0];
 
   LUAJIT_VERSION_SYM();  /* Linker-enforced version check. */
 
@@ -622,9 +620,11 @@ static int pmain(lua_State *L)
 int main(int argc, char **argv)
 {
   int status;
-  lua_State *L = lua_open();
+  lua_State *L;
+  if (!argv[0]) argv = empty_argv; else if (argv[0][0]) progname = argv[0];
+  L = lua_open();  /* create state */
   if (L == NULL) {
-    l_message(argv[0], "cannot create state: not enough memory");
+    l_message("cannot create state: not enough memory");
     return EXIT_FAILURE;
   }
   smain.argc = argc;

test/tarantool-c-tests/fix-argv-handling.test.c

@@ -0,0 +1,39 @@
+#include <unistd.h>
+#include <sys/resource.h>
+#include <stdio.h>
+
+#include "test.h"
+
+static int null_argv(void *test_state)
+{
+  struct rlimit memory_limit = {};
+  getrlimit(RLIMIT_AS, &memory_limit);
+  memory_limit.rlim_cur = memory_limit.rlim_cur >> 25;
+  printf("One: %lld  Two: %lld\n", memory_limit.rlim_cur, memory_limit.rlim_max);
+  if(-1 == setrlimit(RLIMIT_AS, &memory_limit))
+    perror("Fuck!");
+  else
+    printf("Stonks");
+  pid_t pid = fork();
+  if (pid == 0) {
+    execlp("/Users/m.kokryashkin/dev/luajit/build/src/luajit", NULL);
+  }
+  else {
+    int status = 0;
+    waitpid(pid, &status, 0);
+    int segfault_occurred = WIFSIGNALED(status);
+    int exited_with_error = WEXITSTATUS(status);
+    assert_true(segfault_occurred == 0);
+    assert_true(exited_with_error != 0);
+  }
+	return TEST_EXIT_SUCCESS;
+}
+
+int main(void)
+{
+	const struct test_unit tgroup[] = {
+		test_unit_def(null_argv),
+	};
+	const int test_result = test_run_group(tgroup, NULL);
+	return test_result;
+}