Skip to content

Commit 9f70afe

Browse files
author
Gitea
committed
moves checking for EOF in the csv Renderer
1 parent 8dadb94 commit 9f70afe

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

modules/markup/csv/csv.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ func (Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Wri
8989
// FIXME: don't read all to memory
9090
rawBytes, err := ioutil.ReadAll(input)
9191
if err != nil {
92+
if err == io.EOF {
93+
return nil
94+
}
9295
return err
9396
}
9497

@@ -105,6 +108,9 @@ func (Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Wri
105108

106109
rd, err := csv.CreateReaderAndGuessDelimiter(bytes.NewReader(rawBytes))
107110
if err != nil {
111+
if err == io.EOF {
112+
return nil
113+
}
108114
return err
109115
}
110116

routers/web/repo/view.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
518518
Metas: ctx.Repo.Repository.ComposeDocumentMetas(),
519519
GitRepo: ctx.Repo.GitRepo,
520520
}, rd, &result)
521-
if err != nil && err != io.EOF {
521+
if err != nil {
522522
ctx.ServerError("Render", err)
523523
return
524524
}

0 commit comments

Comments
 (0)