Skip to content

Commit 8c48037

Browse files
committed
Force string for hook/concommand/timer/network names & prevent conversion
1 parent cad7927 commit 8c48037

File tree

5 files changed

+23
-8
lines changed

5 files changed

+23
-8
lines changed

lua/blobsprofiler/client/cl_blobsprofiler.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ end
365365

366366
local selectedNode = nil
367367
local function addDTreeNode(parentNode, nodeData, specialType, isRoot, varType, luaState)
368-
local nodeKey = nodeData.key
368+
local nodeKey = tostring(nodeData.key)
369369
local nodeValue = nodeData.value
370370
local dataType = type(nodeValue)
371371
local visualDataType = dataType
@@ -388,7 +388,7 @@ local function addDTreeNode(parentNode, nodeData, specialType, isRoot, varType,
388388
end
389389

390390
if visualDataType == "table" then
391-
childNode = useParent:AddNode(nodeKey)
391+
childNode = useParent:AddNode(istable(nodeValue) and nodeValue.displayName or nodeKey)
392392
childNode.Icon:SetImage(specialType && "icon16/folder_database.png" || "icon16/folder.png")
393393

394394
childNode.oldExpand = childNode.SetExpanded
@@ -450,7 +450,7 @@ local function addDTreeNode(parentNode, nodeData, specialType, isRoot, varType,
450450
nodeText = nodeValue.name or nodeKey
451451
end
452452

453-
childNode = useParent:AddNode(nodeText)
453+
childNode = useParent:AddNode(istable(nodeValue) and nodeValue.displayName or nodeText)
454454
childNode.Icon:SetImage("icon16/".. (blobsProfiler.TypesToIcon[visualDataType] || "page_white_text") ..".png")
455455

456456
childNode.DoClick = function()
@@ -1251,7 +1251,7 @@ net.Receive("blobsProfiler:requestData", function()
12511251

12521252
if #blobsProfiler.chunkModuleData[moduleName].receivedChunks == totalChunks then
12531253
local fullData = table.concat(blobsProfiler.chunkModuleData[moduleName].receivedChunks)
1254-
blobsProfiler.chunkModuleData[moduleName] = util.JSONToTable(util.Decompress(fullData))
1254+
blobsProfiler.chunkModuleData[moduleName] = util.JSONToTable(util.Decompress(fullData), false, true)
12551255

12561256
handleSVDataUpdate(moduleName, blobsProfiler.chunkModuleData[moduleName])
12571257

lua/blobsprofiler/shared/modules/bp_concommands.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ blobsProfiler.RegisterModule("ConCommands", {
77
local concommandsData = {}
88

99
for ccName, ccFunc in pairs(concmdTbl) do
10+
ccName = tostring(ccName)
11+
1012
local debugInfo = debug.getinfo(ccFunc)
1113
concommandsData[ccName] = debugInfo
1214
concommandsData[ccName].func = ccFunc
@@ -26,6 +28,8 @@ blobsProfiler.RegisterModule("ConCommands", {
2628
local concommandsData = {}
2729

2830
for ccName, ccFunc in pairs(concmdTbl) do
31+
ccName = tostring(ccName)
32+
2933
local debugInfo = debug.getinfo(ccFunc)
3034
concommandsData[ccName] = debugInfo
3135
concommandsData[ccName].func = tostring(ccFunc)

lua/blobsprofiler/shared/modules/bp_hooks.lua

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ blobsProfiler.RegisterModule("Hooks", {
55
if luaState == "Client" then
66
local hooksTable = {}
77
for hookName, hookEvents in pairs(hook.GetTable()) do
8+
hookName = tostring(hookName)
9+
810
hooksTable[hookName] = hooksTable[hookName] or {}
9-
1011
for eventName, eventFunc in pairs(hookEvents) do
12+
eventName = tostring(eventName)
13+
1114
local debugInfo = debug.getinfo(eventFunc)
1215
hooksTable[hookName][eventName] = debugInfo
1316
hooksTable[hookName][eventName].func = eventFunc
@@ -26,9 +29,12 @@ blobsProfiler.RegisterModule("Hooks", {
2629
PrepServerData = function()
2730
local hooksTable = {}
2831
for hookName, hookEvents in pairs(hook.GetTable()) do
32+
hookName = tostring(hookName)
33+
2934
hooksTable[hookName] = hooksTable[hookName] or {}
30-
3135
for eventName, eventFunc in pairs(hookEvents) do
36+
eventName = tostring(eventName)
37+
3238
local debugInfo = debug.getinfo(eventFunc)
3339
hooksTable[hookName][eventName] = debugInfo
3440
hooksTable[hookName][eventName].func = tostring(eventFunc)

lua/blobsprofiler/shared/modules/bp_network.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ blobsProfiler.RegisterModule("Network", {
55
if luaState == "Client" then
66
local netRecieversData = {}
77
for recvName, recvFunc in pairs(net.Receivers) do
8+
recvName = tostring(recvName)
9+
810
local debugInfo = debug.getinfo(recvFunc)
911
netRecieversData[recvName] = debugInfo
1012
netRecieversData[recvName].func = recvFunc
@@ -22,6 +24,8 @@ blobsProfiler.RegisterModule("Network", {
2224
PrepServerData = function()
2325
local netRecieversData = {}
2426
for recvName, recvFunc in pairs(net.Receivers) do
27+
recvName = tostring(recvName)
28+
2529
local debugInfo = debug.getinfo(recvFunc)
2630
netRecieversData[recvName] = debugInfo
2731
netRecieversData[recvName].func = tostring(recvFunc)

lua/blobsprofiler/shared/modules/bp_timers.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ local createdTimers = createdTimers or {}
44

55
function timer.Create(identifier, delay, reps, func)
66
local debugInfo = debug.getinfo(func)
7-
8-
createdTimers[identifier] = {
7+
8+
createdTimers[tostring(identifier)] = {
9+
["Identifier: " .. tostring(identifier) ] = tostring(identifier),
910
["Delay: "..delay] = delay,
1011
["Repititions: "..reps] = reps or 0,
1112
[tostring(func)] = {

0 commit comments

Comments
 (0)