From c49ae6bbe562c54e05ba808007863fef8405380d Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Mon, 10 Mar 2025 20:45:19 +0000 Subject: [PATCH] Fix server segfaulting on start FossilOrigin-Name: 9cb357d9b64250fcaa4badfd1f6ba6feb1bfc27a8a9e6375421e5fe46eceec24 --- src/serverutil.mm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/serverutil.mm b/src/serverutil.mm index 38d34d4..716da5a 100644 --- a/src/serverutil.mm +++ b/src/serverutil.mm @@ -160,7 +160,7 @@ int main(int argc, char *argv[]) { int uprate = 0, maxcl = 4; - char *sdesc = "", *ip = "", *master = NULL, *passwd = ""; + const char *sdesc = "", *ip = "", *master = NULL, *passwd = ""; for (int i = 1; i < argc; i++) { char *a = &argv[i][2]; @@ -191,7 +191,8 @@ main(int argc, char *argv[]) if (enet_initialize() < 0) fatal(@"Unable to initialise network module"); - initserver(true, uprate, @(sdesc), @(ip), @(master), @(passwd), maxcl); + initserver(true, uprate, @(sdesc), @(ip), + (master != NULL ? @(master) : nil), @(passwd), maxcl); return 0; } #endif