fix index out of range, closes #40

ibm-messaging · Jul 28, 2021 · 18bfa13 · 18bfa13
1 parent 6b0c90f
commit 18bfa13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/getbycorrelid_test.go b/getbycorrelid_test.go
@@ -202,4 +202,9 @@ func TestCorrelIDParsing(t *testing.T) {
 	msg.SetJMSCorrelationID(testCorrel)
 	assert.Equal(t, testCorrel, msg.GetJMSCorrelationID())
 
+	// Empty correlationID
+	testCorrel = "000000000000000000000000000000000000000000000000"
+	msg.SetJMSCorrelationID(testCorrel)
+	assert.Equal(t, "", msg.GetJMSCorrelationID())
+
 }
diff --git a/mqjms/MessageImpl.go b/mqjms/MessageImpl.go
@@ -175,10 +175,8 @@ func (msg *MessageImpl) GetJMSCorrelationID() string {
 		// Here we identify any padding zero bytes to trim off so that we can try
 		// to turn it back into a string.
 		realLength := len(correlIDBytes)
-		if realLength > 0 {
-			for correlIDBytes[realLength-1] == 0 {
-				realLength--
-			}
+		for realLength > 0 && correlIDBytes[realLength-1] == 0 {
+			realLength--
 		}
 
 		// Attempt to decode the content back into a string.