mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-13 14:30:25 +00:00
bc7c8e3c84
When attempting to render a markdown code block that does not have a language set in it, Forgejo will fail to render and log an error: ``` 2026/04/29 08:47:47 ...markdown/markdown.go:162:func1() [W] Unable to render markdown due to panic in goldmark: runtime error: invalid memory address or nil pointer dereference ``` This is a regression introduced by #12056. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. All work and communication must conform to Forgejo's [AI Agreement](https://codeberg.org/forgejo/governance/src/branch/main/AIAgreement.md). There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests for Go changes - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I ran... - [x] `make pr-go` before pushing ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [x] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. - pre-release regression Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12325 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
30 lines
678 B
Go
30 lines
678 B
Go
// Copyright 2026 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package markdown
|
|
|
|
import (
|
|
"bytes"
|
|
|
|
"github.com/yuin/goldmark/ast"
|
|
"github.com/yuin/goldmark/text"
|
|
)
|
|
|
|
func (g *ASTTransformer) transformCodeblockLanguage(v *ast.FencedCodeBlock, reader text.Reader) {
|
|
if v.Info == nil {
|
|
return
|
|
}
|
|
src := reader.Source()
|
|
info := v.Info.Segment.Value(src)
|
|
// Strip language after commas
|
|
//
|
|
// For example,
|
|
// ```rust,ignore
|
|
// ...
|
|
// ```
|
|
// Should have a language of "rust", not "rust,ignore"
|
|
if i := bytes.IndexByte(info, ','); i != -1 {
|
|
start := v.Info.Segment.Start
|
|
v.Info = ast.NewTextSegment(text.NewSegment(start, start+i))
|
|
}
|
|
}
|