Skip to content

Commit c47f12a

Browse files
committed
Open regular files only
1 parent c08e277 commit c47f12a

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

targz.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,14 +207,9 @@ func writeDirectory(directory string, tarWriter *tar.Writer, subPath string) err
207207

208208
// Write path without the prefix in subPath to tar writer.
209209
func writeTarGz(path string, tarWriter *tar.Writer, fileInfo os.FileInfo, subPath string) error {
210-
file, err := os.Open(path)
211-
if err != nil {
212-
return err
213-
}
214-
defer file.Close()
215-
216210
var link string
217211
if fileInfo.Mode()&os.ModeSymlink == os.ModeSymlink {
212+
var err error
218213
if link, err = os.Readlink(path); err != nil {
219214
return err
220215
}
@@ -235,6 +230,12 @@ func writeTarGz(path string, tarWriter *tar.Writer, fileInfo os.FileInfo, subPat
235230
return nil
236231
}
237232

233+
file, err := os.Open(path)
234+
if err != nil {
235+
return err
236+
}
237+
defer file.Close()
238+
238239
_, err = io.Copy(tarWriter, file)
239240
if err != nil {
240241
return err

0 commit comments

Comments
 (0)