commit 35b994e1e7cee2dd2274b5b180c92ff66750cda8
author Cole Faust <colefaust@google.com> Wed Apr 27 13:37:32 2022 -0700
committer Cole Faust <colefaust@google.com> Thu Apr 28 16:08:02 2022 -0700
tree d5e71d5958953ba90665549b12c544f08afaf93a
parent a59059f3a179d2c6de18e7ca3db7c565eba1c02e

Fix crash in MakeString.EndsWith()

Bug: 226974242
Test: go test
Change-Id: I21ff26d00ed7be145ae2c1175f1438b6e7d60834

androidmk/parser/make_strings.go

diff --git a/androidmk/parser/make_strings.go b/androidmk/parser/make_strings.go
index 8030326..416e430 100644
--- a/androidmk/parser/make_strings.go
+++ b/androidmk/parser/make_strings.go
@@ -279,7 +279,7 @@
 
 func (ms *MakeString) EndsWith(ch rune) bool {
 	s := ms.Strings[len(ms.Strings)-1]
-	return s[len(s)-1] == uint8(ch)
+	return len(s) > 0 && s[len(s)-1] == uint8(ch)
 }
 
 func (ms *MakeString) ReplaceLiteral(input string, output string) {