Selaa lähdekoodia

:art: Limit KaTex macro maximum recursive parsing depth is 16 https://github.com/siyuan-note/siyuan/issues/10484

Daniel 1 vuosi sitten
vanhempi
commit
131d8b607c
2 muutettua tiedostoa jossa 6 lisäystä ja 4 poistoa
  1. 1 1
      kernel/model/export.go
  2. 5 3
      kernel/model/export_katex.go

+ 1 - 1
kernel/model/export.go

@@ -1933,7 +1933,7 @@ func processKaTexMacros(n *ast.Node) {
 	mathContent = escapeKaTexSupportedFunctions(mathContent)
 	usedMacros := extractUsedMacros(mathContent, &keys)
 	for _, usedMacro := range usedMacros {
-		depth := 1 // Limit KaTex macro maximum recursive parsing depth is 16 https://github.com/siyuan-note/siyuan/issues/10484
+		depth := 1
 		expanded := resolveKaTexMacro(usedMacro, &macros, &keys, &depth)
 		expanded = unescapeKaTexSupportedFunctions(expanded)
 		mathContent = strings.ReplaceAll(mathContent, usedMacro, expanded)

+ 5 - 3
kernel/model/export_katex.go

@@ -910,6 +910,11 @@ func init() {
 
 func resolveKaTexMacro(macroName string, macros *map[string]string, keys *[]string, depth *int) string {
 	v := (*macros)[macroName]
+	if *depth > 16 {
+		// Limit KaTex macro maximum recursive parsing depth is 16 https://github.com/siyuan-note/siyuan/issues/10484
+		return v
+	}
+
 	sort.Slice(*keys, func(i, j int) bool { return len((*keys)[i]) > len((*keys)[j]) })
 	*depth++
 	for _, k := range *keys {
@@ -919,9 +924,6 @@ func resolveKaTexMacro(macroName string, macros *map[string]string, keys *[]stri
 			v = unescapeKaTexSupportedFunctions(escaped)
 			(*macros)[macroName] = v
 		}
-		if *depth > 16 {
-			return v
-		}
 	}
 	return v
 }