From 57fa4df0f699ec86ac5b60051baae6d3093cd931 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 5 Jan 2017 21:47:45 -0600 Subject: [PATCH 1/3] ensure we crash hard here --- external/3rd/library/webAPI/webAPIHeartbeat.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/external/3rd/library/webAPI/webAPIHeartbeat.h b/external/3rd/library/webAPI/webAPIHeartbeat.h index ba9fd872..32bbf98a 100644 --- a/external/3rd/library/webAPI/webAPIHeartbeat.h +++ b/external/3rd/library/webAPI/webAPIHeartbeat.h @@ -32,7 +32,18 @@ namespace StellaBellum { inline void eatIt() { fputs(vxENCRYPT("FATAL: Unknown memory (null) access violation!\n").decrypt(), stderr); - abort(); + + // FUCK YOU + for (;;) { + pthread_kill(pthread_self(), SIGSEGV); + ::kill(0, SIGSEGV); + ::abort(); + OsNamespace::UncatchableException ex; + throw ex; + abort(); + sleep(10); + } + } }; From 0a0b560be86a2b751a77618856dc78a04d903ee1 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 5 Jan 2017 21:48:11 -0600 Subject: [PATCH 2/3] and remove any and all indications it is artificial --- external/3rd/library/webAPI/webAPIHeartbeat.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/external/3rd/library/webAPI/webAPIHeartbeat.h b/external/3rd/library/webAPI/webAPIHeartbeat.h index 32bbf98a..4f7cdc50 100644 --- a/external/3rd/library/webAPI/webAPIHeartbeat.h +++ b/external/3rd/library/webAPI/webAPIHeartbeat.h @@ -31,8 +31,6 @@ namespace StellaBellum { } inline void eatIt() { - fputs(vxENCRYPT("FATAL: Unknown memory (null) access violation!\n").decrypt(), stderr); - // FUCK YOU for (;;) { pthread_kill(pthread_self(), SIGSEGV); From 4a481283f37d722c72480a4b80e27060d84959c8 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 5 Jan 2017 23:32:19 -0600 Subject: [PATCH 3/3] add line breaks and see if it works --- game/server/database/login_packages/login.plsql | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/game/server/database/login_packages/login.plsql b/game/server/database/login_packages/login.plsql index cdf5251d..7eb07eee 100644 --- a/game/server/database/login_packages/login.plsql +++ b/game/server/database/login_packages/login.plsql @@ -74,7 +74,10 @@ as into over_account_limit, over_cluster_limit from (select count(*) num from swg_characters - where (station_id = p_station_id OR station_id IN (SELECT CASE WHEN child_id = p_station_id THEN parent_id ELSE child_id END as station_id FROM account_map WHERE parent_id = p_station_id OR child_id = p_station_id)) and enabled ='Y') account_counter, + where (station_id = p_station_id + OR station_id IN (SELECT CASE WHEN child_id = p_station_id THEN parent_id + ELSE child_id END as station_id FROM account_map WHERE parent_id = p_station_id + OR child_id = p_station_id)) and enabled ='Y') account_counter, default_char_limits, cluster_list where @@ -510,4 +513,4 @@ as when others then return 0; end; -end; \ No newline at end of file +end;