checking length on stripExcessSpaces (#1372)

aws · Jun 26, 2017 · 641e238 · 641e238
1 parent 6983621
commit 641e238
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/aws/signer/v4/v4.go b/aws/signer/v4/v4.go
@@ -745,7 +745,8 @@ func stripExcessSpaces(headerVals []string) []string {
 				}
 			}
 
-			if stripToIdx >= 0 {
+			if stripToIdx >= 0 && stripToIdx < len(buf) {
+				// Find next double space
 				idx = bytes.Index(buf[stripToIdx:], doubleSpaceBytes)
 				if idx >= 0 {
 					idx += stripToIdx

diff --git a/aws/signer/v4/v4_test.go b/aws/signer/v4/v4_test.go
@@ -28,6 +28,7 @@ func TestStripExcessHeaders(t *testing.T) {
 		"1  2  3",
 		"1  2  ",
 		" 1  2  ",
+		"12   3",
 	}
 
 	expected := []string{
@@ -39,6 +40,7 @@ func TestStripExcessHeaders(t *testing.T) {
 		"1 2 3",
 		"1 2",
 		"1 2",
+		"12 3",
 	}
 
 	newVals := stripExcessSpaces(vals)