🐛 Fix NPE #11497

siyuan-note · May 23, 2024 · 98e8083 · 98e8083
1 parent f10c0bc
commit 98e8083
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/kernel/model/render.go b/kernel/model/render.go
@@ -93,6 +93,10 @@ func renderOutline(heading *ast.Node, luteEngine *lute.Lute) (ret string) {
 }
 
 func renderBlockText(node *ast.Node, excludeTypes []string) (ret string) {
+	if nil == node {
+		return
+	}
+
 	ret = sql.NodeStaticContent(node, excludeTypes, false, false, false, GetBlockAttrsWithoutWaitWriting)
 	ret = strings.TrimSpace(ret)
 	ret = strings.ReplaceAll(ret, "\n", "")

diff --git a/kernel/sql/block.go b/kernel/sql/block.go
@@ -139,6 +139,10 @@ func indexNode(tx *sql.Tx, id string) (err error) {
 
 func NodeStaticContent(node *ast.Node, excludeTypes []string, includeTextMarkATitleURL, includeAssetPath, fullAttrView bool,
 	GetBlockAttrsWithoutWaitWriting func(id string) (ret map[string]string)) string {
+	if nil == node {
+		return ""
+	}
+
 	if ast.NodeAttributeView == node.Type {
 		if fullAttrView {
 			return getAttributeViewContent(node.AttributeViewID, GetBlockAttrsWithoutWaitWriting)

diff --git a/kernel/sql/block_query.go b/kernel/sql/block_query.go
@@ -812,6 +812,10 @@ func GetContainerText(container *ast.Node) string {
 	buf := &bytes.Buffer{}
 	buf.Grow(4096)
 	leaf := treenode.FirstLeafBlock(container)
+	if nil == leaf {
+		return ""
+	}
+
 	ast.Walk(leaf, func(n *ast.Node, entering bool) ast.WalkStatus {
 		if !entering {
 			return ast.WalkContinue