Fix #6 - don't panic when len(Message)<2

parse-nl · May 13, 2019 · da2ff92 · da2ff92
1 parent ced89e0
commit da2ff92
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/SystemdJournal2Gelf.go b/SystemdJournal2Gelf.go
@@ -125,7 +125,7 @@ func (this *SystemdJournalEntry) send() {
 }
 
 func (this *SystemdJournalEntry) isJsonMessage() bool {
-	return this.Message[0:2] == `{"`
+	return len(this.Message) > 4 && this.Message[0:2] == `{"`
 }
 
 type pendingEntry struct {

diff --git a/SystemdJournal2Gelf_test.go b/SystemdJournal2Gelf_test.go
@@ -117,6 +117,20 @@ func TestDateStrippedFromMessage(t *testing.T) {
 	AssertEquals(t, 4, len(gelf.Extra))
 }
 
+func TestShortLinesDontTriggerPanic(t *testing.T) {
+	entry := SystemdJournalEntry{}
+
+	err := json.Unmarshal([]byte(`{
+        "MESSAGE" : ""
+	}`), &entry)
+
+	AssertNotError(t, err)
+
+	gelf := entry.toGelf()
+
+	AssertEquals(t, "", gelf.Short)
+}
+
 // asserts
 
 func AssertEquals(t *testing.T, expected, actual interface{}) {