Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Recover panic in orgmode.Render if bad orgfile (#4982) #5903

Merged

Conversation

@zeripath
Copy link
Contributor

commented Jan 30, 2019

This PR protects against the panic referred to in chaseadamsio/goorgeous#82
by recovering from the panic and just returning the raw bytes if
there is an error.

Fix #4982 Fix #5430

Signed-off-by: Andrew Thornton art27@cantab.net

Recover panic in orgmode.Render if bad orgfile (#4982)
This PR protects against the panic referred to in chaseadmsio/goorgeous#82
by recovering from the panic and just returning the raw bytes if
there is an error.

Signed-off-by: Andrew Thornton <art27@cantab.net>

@techknowlogick techknowlogick added this to the 1.8.0 milestone Jan 30, 2019

@codecov-io

This comment has been minimized.

Copy link

commented Jan 30, 2019

Codecov Report

❗️ No coverage uploaded for pull request base (master@ca00ca8). Click here to learn what that means.
The diff coverage is 50%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #5903   +/-   ##
=========================================
  Coverage          ?   37.96%           
=========================================
  Files             ?      329           
  Lines             ?    48404           
  Branches          ?        0           
=========================================
  Hits              ?    18378           
  Misses            ?    27385           
  Partials          ?     2641
Impacted Files Coverage Δ
modules/markup/orgmode/orgmode.go 76.92% <50%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ca00ca8...6111cc6. Read the comment docs.

@GiteaBot GiteaBot added lgtm/need 1 and removed lgtm/need 2 labels Jan 30, 2019

@GiteaBot GiteaBot added lgtm/done and removed lgtm/need 1 labels Jan 30, 2019

@techknowlogick techknowlogick merged commit 0823791 into go-gitea:master Jan 30, 2019

2 checks passed

approvals/lgtm this commit looks good
continuous-integration/drone/pr the build was successful
Details
@lunny

This comment has been minimized.

Copy link
Member

commented Jan 31, 2019

Maybe you could send a back port to v1.7?

@lunny lunny added the backport/v1.7 label Jan 31, 2019

zeripath added a commit to zeripath/gitea that referenced this pull request Feb 16, 2019

Recover panic in orgmode.Render if bad orgfile (go-gitea#4982) (go-gi…
…tea#5903)

This PR protects against the panic referred to in chaseadmsio/goorgeous#82
by recovering from the panic and just returning the raw bytes if
there is an error.

Signed-off-by: Andrew Thornton <art27@cantab.net>

@zeripath zeripath deleted the zeripath:fix-4982-panic-on-bad-org-file branch Feb 16, 2019

techknowlogick added a commit that referenced this pull request Feb 16, 2019

Recover panic in orgmode.Render if bad orgfile (#4982) (#5903) (#6097)
This PR protects against the panic referred to in chaseadmsio/goorgeous#82
by recovering from the panic and just returning the raw bytes if
there is an error.

Signed-off-by: Andrew Thornton <art27@cantab.net>

Mikescher added a commit to Mikescher/gitea that referenced this pull request Mar 20, 2019

Recover panic in orgmode.Render if bad orgfile (go-gitea#4982) (go-gi…
…tea#5903)

This PR protects against the panic referred to in chaseadmsio/goorgeous#82
by recovering from the panic and just returning the raw bytes if
there is an error.

Signed-off-by: Andrew Thornton <art27@cantab.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
6 participants
You can’t perform that action at this time.