From 2cd045b8feb3391535dc6f972ad7b77360dca675 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 19 Jun 2018 10:10:30 -0400 Subject: [PATCH 1/2] [s] Fixes direct sql datum call exploit. --- code/controllers/subsystem/dbcore.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 0e1f1fb8fd..4692826a9c 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -237,6 +237,22 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table item = list() _db_query = _dm_db_new_query() +<<<<<<< HEAD +======= +/datum/DBQuery/Destroy() + Close() + SSdbcore.active_queries -= src + return ..() + +/datum/DBQuery/CanProcCall(proc_name) + //fuck off kevinz + return FALSE + +/datum/DBQuery/proc/Activity(activity) + last_activity = activity + last_activity_time = world.time + +>>>>>>> 1a22d45... [s] Fixes stack overflow (#38592) /datum/DBQuery/proc/warn_execute() . = Execute() if(!.) From 6685bfcc8ba2814a22933b2449cb50d3125644ea Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 24 Jun 2018 15:04:24 -0500 Subject: [PATCH 2/2] Update dbcore.dm --- code/controllers/subsystem/dbcore.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 4692826a9c..dbca802036 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -237,8 +237,6 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table item = list() _db_query = _dm_db_new_query() -<<<<<<< HEAD -======= /datum/DBQuery/Destroy() Close() SSdbcore.active_queries -= src @@ -252,7 +250,6 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table last_activity = activity last_activity_time = world.time ->>>>>>> 1a22d45... [s] Fixes stack overflow (#38592) /datum/DBQuery/proc/warn_execute() . = Execute() if(!.)