cherry pick googleapis#429

shawn-liangg · Mar 26, 2020 · a776606 · a776606
1 parent 721295f
commit a776606
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/gensupport/media.go b/gensupport/media.go
@@ -290,6 +290,10 @@ func (mi *MediaInfo) UploadRequest(reqHeaders http.Header, body io.Reader) (newB
 		fb := readerFunc(body)
 		fm := readerFunc(media)
 		combined, ctype := CombineBodyMedia(body, "application/json", media, mi.mType)
+		toCleanup := []io.Closer{
+			combined,
+		}
+
 		if fb != nil && fm != nil {
 			getBody = func() (io.ReadCloser, error) {
 				rb := ioutil.NopCloser(fb())
@@ -302,7 +306,11 @@ func (mi *MediaInfo) UploadRequest(reqHeaders http.Header, body io.Reader) (newB
 				return r, nil
 			}
 		}
-		cleanup = func() { combined.Close() }
+		cleanup = func() {
+			for _, closer := range toCleanup {
+				_ = closer.Close()
+			}
+		}
 		reqHeaders.Set("Content-Type", ctype)
 		body = combined
 	}