Merge pull request containers#18209 from mtrmac/no-NewBuffer

Don't use bytes.NewBuffer to read data
vrothberg · Apr 17, 2023 · 5c70641 · 5c70641
2 parents 625ff8f + e9356ba
commit 5c70641
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go
@@ -257,7 +257,7 @@ func (r *ConmonOCIRuntime) UpdateContainerStatus(ctr *Container) error {
 	if err != nil {
 		return fmt.Errorf("reading stdout: %s: %w", ctr.ID(), err)
 	}
-	if err := json.NewDecoder(bytes.NewBuffer(out)).Decode(state); err != nil {
+	if err := json.NewDecoder(bytes.NewReader(out)).Decode(state); err != nil {
 		return fmt.Errorf("decoding container status for container %s: %w", ctr.ID(), err)
 	}
 	ctr.state.PID = state.Pid

diff --git a/pkg/domain/infra/abi/play_test.go b/pkg/domain/infra/abi/play_test.go
@@ -99,7 +99,7 @@ binaryData:
 	for _, test := range tests {
 		test := test
 		t.Run(test.name, func(t *testing.T) {
-			buf := bytes.NewBufferString(test.configMapContent)
+			buf := bytes.NewReader([]byte(test.configMapContent))
 			cm, err := readConfigMapFromFile(buf)
 
 			if test.expectError {