Fix crash when enabling debugger under Linux

vadz · vadz · commit e739d887429e · 2023-08-28T00:43:57.000+02:00
Rename buffer_init() to avoid clashing with a function with the same name in luasocket code: under Linux, due to the of "flat" ELF namespaces, when luasocket shared library is loaded into premake process the existing premake function is used instead of the function defined in luasocket code, resulting in luasocket buffer not being properly initialized which, in turn, leads to mysterious crashes as soon as it's used, e.g. dereferencing null timeout field: (gdb) bt #0 0x00007ffff7cce642 in timeout_markstart (tm=0x0) at ../../binmodules/luasocket/src/timeout.c:116 #1 0x00007ffff7cc7618 in buffer_meth_receive (L=0x5555557882a8, buf=0x5555559044a0) at ../../binmodules/luasocket/src/buffer.c:113 #2 0x00007ffff7ccd545 in meth_receive (L=0x5555557882a8) at ../../binmodules/luasocket/src/tcp.c:135 #3 0x000055555558c1cc in luaD_precall (L=0x5555557882a8, func=0x5555558e36b0, nresults=1) at ../../contrib/lua/src/ldo.c:434 #4 0x00005555555a971f in luaV_execute (L=0x5555557882a8) at ../../contrib/lua/src/lvm.c:1134 #5 0x000055555558c555 in luaD_call (L=0x5555557882a8, func=0x5555558e3640, nResults=0) at ../../contrib/lua/src/ldo.c:499 premake#6 0x000055555558c5b3 in luaD_callnoyield (L=0x5555557882a8, func=0x5555558e3640, nResults=0) at ../../contrib/lua/src/ldo.c:509 premake#7 0x0000555555588af5 in lua_callk (L=0x5555557882a8, nargs=2, nresults=0, ctx=0, k=0x0) at ../../contrib/lua/src/lapi.c:925 premake#8 0x00005555555af4f2 in hookf (L=0x5555557882a8, ar=0x7fffffffd270) at ../../contrib/lua/src/ldblib.c:316 premake#9 0x000055555558bafb in luaD_hook (L=0x5555557882a8, event=2, line=273) at ../../contrib/lua/src/ldo.c:269 premake#10 0x000055555558b284 in luaG_traceexec (L=0x5555557882a8) at ../../contrib/lua/src/ldebug.c:687 premake#11 0x00005555555a6b71 in luaV_execute (L=0x5555557882a8) at ../../contrib/lua/src/lvm.c:801 premake#12 0x000055555558c555 in luaD_call (L=0x5555557882a8, func=0x555555889360, nResults=1) at ../../contrib/lua/src/ldo.c:499 premake#13 0x000055555558c5b3 in luaD_callnoyield (L=0x5555557882a8, func=0x555555889360, nResults=1) at ../../contrib/lua/src/ldo.c:509 premake#14 0x0000555555588b60 in f_call (L=0x5555557882a8, ud=0x7fffffffdbb0) at ../../contrib/lua/src/lapi.c:943 premake#15 0x000055555558b5a5 in luaD_rawrunprotected (L=0x5555557882a8, f=0x555555588b2b <f_call>, ud=0x7fffffffdbb0) at ../../contrib/lua/src/ldo.c:142 premake#16 0x000055555558cd85 in luaD_pcall (L=0x5555557882a8, func=0x555555588b2b <f_call>, u=0x7fffffffdbb0, old_top=64, ef=48) at ../../contrib/lua/src/ldo.c:729 premake#17 0x0000555555588c28 in lua_pcallk (L=0x5555557882a8, nargs=0, nresults=1, errfunc=3, ctx=0, k=0x0) at ../../contrib/lua/src/lapi.c:969 premake#18 0x0000555555584734 in premake_pcall (L=0x5555557882a8, nargs=0, nresults=1) at ../../src/host/premake.c:287 premake#19 0x0000555555584867 in premake_execute (L=0x5555557882a8, argc=5, argv=0x7fffffffdd98, script=0x555555685052 "src/_premake_main.lua") at ../../src/host/premake.c:316 premake#20 0x000055555558535e in main (argc=5, argv=0x7fffffffdd98) at ../../src/host/premake_main.c:19 For consistency, rename all the other buffer_xxx functions too, even though they don't conflict with anything right now.
diff --git a/src/host/buffered_io.c b/src/host/buffered_io.c
@@ -9,22 +9,22 @@
 #include "premake.h"
 #include "buffered_io.h"
 
-void buffer_init(Buffer* b)
+void premake_buffer_init(Buffer* b)
 {
 	b->capacity = 0;
 	b->length = 0;
 	b->data = NULL;
 }
 
-void buffer_destroy(Buffer* b)
+void premake_buffer_destroy(Buffer* b)
 {
 	free(b->data);
 	b->capacity = 0;
 	b->length = 0;
 	b->data = NULL;
 }
 
-void buffer_puts(Buffer* b, const void* ptr, size_t len)
+void premake_buffer_puts(Buffer* b, const void* ptr, size_t len)
 {
 	char* data;
 
@@ -53,23 +53,23 @@ void buffer_puts(Buffer* b, const void* ptr, size_t len)
 	b->length += len;
 }
 
-void buffer_printf(Buffer* b, const char *fmt, ...)
+void premake_buffer_printf(Buffer* b, const char *fmt, ...)
 {
 	char text[2048];
 	int len;
 	va_list args;
 	va_start(args, fmt);
 	len = vsnprintf(text, sizeof(text) - 1, fmt, args);
 	va_end(args);
-	buffer_puts(b, text, len);
+	premake_buffer_puts(b, text, len);
 }
 
 // -- Lua wrappers ----------------------------------------
 
 int buffered_new(lua_State* L)
 {
 	Buffer* b = (Buffer*)malloc(sizeof(Buffer));
-	buffer_init(b);
+	premake_buffer_init(b);
 	lua_pushlightuserdata(L, b);
 	return 1;
 }
@@ -80,7 +80,7 @@ int buffered_write(lua_State* L)
 	const char *s = luaL_checklstring(L, 2, &len);
 	Buffer* b = (Buffer*)lua_touserdata(L, 1);
 
-	buffer_puts(b, s, len);
+	premake_buffer_puts(b, s, len);
 	return 0;
 }
 
@@ -91,15 +91,15 @@ int buffered_writeln(lua_State* L)
 	Buffer* b = (Buffer*)lua_touserdata(L, 1);
 
 	if (s != NULL)
-		buffer_puts(b, s, len);
-	buffer_puts(b, "\r\n", 2);
+		premake_buffer_puts(b, s, len);
+	premake_buffer_puts(b, "\r\n", 2);
 	return 0;
 }
 
 int buffered_close(lua_State* L)
 {
 	Buffer* b = (Buffer*)lua_touserdata(L, 1);
-	buffer_destroy(b);
+	premake_buffer_destroy(b);
 	free(b);
 	return 0;
 }
diff --git a/src/host/buffered_io.h b/src/host/buffered_io.h
@@ -15,10 +15,10 @@ typedef struct struct_Buffer
 	char*  data;
 } Buffer;
 
-void buffer_init(Buffer* b);
-void buffer_destroy(Buffer* b);
+void premake_buffer_init(Buffer* b);
+void premake_buffer_destroy(Buffer* b);
 
-void buffer_puts(Buffer* b, const void* ptr, size_t len);
-void buffer_printf(Buffer* b, const char* s, ...);
+void premake_buffer_puts(Buffer* b, const void* ptr, size_t len);
+void premake_buffer_printf(Buffer* b, const char* s, ...);
 
 #endif
diff --git a/src/host/curl_utils.c b/src/host/curl_utils.c
@@ -35,7 +35,7 @@ int curlProgressCallback(curl_state* state, double dltotal, double dlnow, double
 size_t curlWriteCallback(char *ptr, size_t size, size_t nmemb, curl_state* state)
 {
 	size_t length = size * nmemb;
-	buffer_puts(&state->S, ptr, length);
+	premake_buffer_puts(&state->S, ptr, length);
 	return length;
 }
 
@@ -74,7 +74,7 @@ CURL* curlRequest(lua_State* L, curl_state* state, int optionsIndex, int progres
 	state->RefIndex = 0;
 	state->errorBuffer[0] = '\0';
 	state->headers = NULL;
-	buffer_init(&state->S);
+	premake_buffer_init(&state->S);
 
 	curl_init();
 	curl = curl_easy_init();
diff --git a/src/host/http_download.c b/src/host/http_download.c
@@ -68,7 +68,7 @@ int http_download(lua_State* L)
 		lua_pushstring(L, "OK");
 	}
 
-	buffer_destroy(&state.S);
+	premake_buffer_destroy(&state.S);
 	lua_pushnumber(L, (lua_Number)responseCode);
 	return 2;
 }
diff --git a/src/host/http_get.c b/src/host/http_get.c
@@ -51,7 +51,7 @@ int http_get(lua_State* L)
 		lua_pushstring(L, "OK");
 	}
 
-	buffer_destroy(&state.S);
+	premake_buffer_destroy(&state.S);
 	lua_pushnumber(L, (lua_Number)responseCode);
 	return 3;
 }
diff --git a/src/host/http_post.c b/src/host/http_post.c
@@ -49,7 +49,7 @@ int http_post(lua_State* L)
 		lua_pushstring(L, "OK");
 	}
 
-	buffer_destroy(&state.S);
+	premake_buffer_destroy(&state.S);
 	lua_pushnumber(L, (lua_Number)responseCode);
 	return 3;
 }

Original file line number	Diff line number	Diff line change
`@@ -9,22 +9,22 @@`
`9`	`9`	`#include "premake.h"`
`10`	`10`	`#include "buffered_io.h"`
`11`	`11`
`12`		`-void buffer_init(Buffer* b)`
	`12`	`+void premake_buffer_init(Buffer* b)`
`13`	`13`	`{`
`14`	`14`	`b->capacity = 0;`
`15`	`15`	`b->length = 0;`
`16`	`16`	`b->data = NULL;`
`17`	`17`	`}`
`18`	`18`
`19`		`-void buffer_destroy(Buffer* b)`
	`19`	`+void premake_buffer_destroy(Buffer* b)`
`20`	`20`	`{`
`21`	`21`	`free(b->data);`
`22`	`22`	`b->capacity = 0;`
`23`	`23`	`b->length = 0;`
`24`	`24`	`b->data = NULL;`
`25`	`25`	`}`
`26`	`26`
`27`		`-void buffer_puts(Buffer* b, const void* ptr, size_t len)`
	`27`	`+void premake_buffer_puts(Buffer* b, const void* ptr, size_t len)`
`28`	`28`	`{`
`29`	`29`	`char* data;`
`30`	`30`
`@@ -53,23 +53,23 @@ void buffer_puts(Buffer* b, const void* ptr, size_t len)`
`53`	`53`	`b->length += len;`
`54`	`54`	`}`
`55`	`55`
`56`		`-void buffer_printf(Buffer* b, const char *fmt, ...)`
	`56`	`+void premake_buffer_printf(Buffer* b, const char *fmt, ...)`
`57`	`57`	`{`
`58`	`58`	`char text[2048];`
`59`	`59`	`int len;`
`60`	`60`	`va_list args;`
`61`	`61`	`va_start(args, fmt);`
`62`	`62`	`len = vsnprintf(text, sizeof(text) - 1, fmt, args);`
`63`	`63`	`va_end(args);`
`64`		`- buffer_puts(b, text, len);`
	`64`	`+ premake_buffer_puts(b, text, len);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`// -- Lua wrappers ----------------------------------------`
`68`	`68`
`69`	`69`	`int buffered_new(lua_State* L)`
`70`	`70`	`{`
`71`	`71`	`Buffer* b = (Buffer*)malloc(sizeof(Buffer));`
`72`		`- buffer_init(b);`
	`72`	`+ premake_buffer_init(b);`
`73`	`73`	`lua_pushlightuserdata(L, b);`
`74`	`74`	`return 1;`
`75`	`75`	`}`
`@@ -80,7 +80,7 @@ int buffered_write(lua_State* L)`
`80`	`80`	`const char *s = luaL_checklstring(L, 2, &len);`
`81`	`81`	`Buffer* b = (Buffer*)lua_touserdata(L, 1);`
`82`	`82`
`83`		`- buffer_puts(b, s, len);`
	`83`	`+ premake_buffer_puts(b, s, len);`
`84`	`84`	`return 0;`
`85`	`85`	`}`
`86`	`86`
`@@ -91,15 +91,15 @@ int buffered_writeln(lua_State* L)`
`91`	`91`	`Buffer* b = (Buffer*)lua_touserdata(L, 1);`
`92`	`92`
`93`	`93`	`if (s != NULL)`
`94`		`- buffer_puts(b, s, len);`
`95`		`- buffer_puts(b, "\r\n", 2);`
	`94`	`+ premake_buffer_puts(b, s, len);`
	`95`	`+ premake_buffer_puts(b, "\r\n", 2);`
`96`	`96`	`return 0;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`int buffered_close(lua_State* L)`
`100`	`100`	`{`
`101`	`101`	`Buffer* b = (Buffer*)lua_touserdata(L, 1);`
`102`		`- buffer_destroy(b);`
	`102`	`+ premake_buffer_destroy(b);`
`103`	`103`	`free(b);`
`104`	`104`	`return 0;`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ int http_download(lua_State* L)`
`68`	`68`	`lua_pushstring(L, "OK");`
`69`	`69`	`}`
`70`	`70`
`71`		`- buffer_destroy(&state.S);`
	`71`	`+ premake_buffer_destroy(&state.S);`
`72`	`72`	`lua_pushnumber(L, (lua_Number)responseCode);`
`73`	`73`	`return 2;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ int http_get(lua_State* L)`
`51`	`51`	`lua_pushstring(L, "OK");`
`52`	`52`	`}`
`53`	`53`
`54`		`- buffer_destroy(&state.S);`
	`54`	`+ premake_buffer_destroy(&state.S);`
`55`	`55`	`lua_pushnumber(L, (lua_Number)responseCode);`
`56`	`56`	`return 3;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ int http_post(lua_State* L)`
`49`	`49`	`lua_pushstring(L, "OK");`
`50`	`50`	`}`
`51`	`51`
`52`		`- buffer_destroy(&state.S);`
	`52`	`+ premake_buffer_destroy(&state.S);`
`53`	`53`	`lua_pushnumber(L, (lua_Number)responseCode);`
`54`	`54`	`return 3;`
`55`	`55`	`}`