Skip to content

Commit 29fd7a1

Browse files
committed
fix: fix panic where we blindly extract data
1 parent 4f94e48 commit 29fd7a1

File tree

1 file changed

+24
-22
lines changed

1 file changed

+24
-22
lines changed

object.go

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,31 @@ func PrintData(value any, decode, printHex bool,
6666
var message string
6767
fnName := fmt.Sprintf("%d) Name: %s\n", msg, data["name"])
6868
connName := fmt.Sprintf("Connection Name: %s\n", data["connName"])
69-
printData(reflect.ValueOf(data["dictionary"]), "", "", &message)
70-
total := len(fnName) + len(connName) + len(message) + 100
71-
72-
builder := strings.Builder{}
73-
builder.Grow(total)
74-
75-
builder.WriteString(fnName)
76-
builder.WriteString(connName)
77-
builder.WriteString("Data:\n")
78-
builder.WriteString(message)
79-
builder.WriteString(fmt.Sprintf("\n%s\n", strings.Repeat("=", 80)))
80-
81-
logger.Scriptf("%d) Name: %s", msg, data["name"])
82-
logger.Scriptf("Connection Name: %s", data["connName"])
83-
pid, ok := data["pid"].(float64)
84-
if ok {
85-
logger.Scriptf("PID: %d", int(pid))
86-
}
87-
logger.Scriptf("Data:")
88-
logger.Scriptf("%s", message)
89-
fmt.Println(strings.Repeat("=", 80))
69+
if _, ok := data["dictionary"]; ok {
70+
printData(reflect.ValueOf(data["dictionary"]), "", "", &message)
71+
total := len(fnName) + len(connName) + len(message) + 100
72+
73+
builder := strings.Builder{}
74+
builder.Grow(total)
75+
76+
builder.WriteString(fnName)
77+
builder.WriteString(connName)
78+
builder.WriteString("Data:\n")
79+
builder.WriteString(message)
80+
builder.WriteString(fmt.Sprintf("\n%s\n", strings.Repeat("=", 80)))
81+
82+
logger.Scriptf("%d) Name: %s", msg, data["name"])
83+
logger.Scriptf("Connection Name: %s", data["connName"])
84+
pid, ok := data["pid"].(float64)
85+
if ok {
86+
logger.Scriptf("PID: %d", int(pid))
87+
}
88+
logger.Scriptf("Data:")
89+
logger.Scriptf("%s", message)
90+
fmt.Println(strings.Repeat("=", 80))
9091

91-
logger.writeToFileScript(builder.String())
92+
logger.writeToFileScript(builder.String())
93+
}
9294
}
9395

9496
func printData(v reflect.Value, key, indent string, message *string) {

0 commit comments

Comments
 (0)