Fix parsing of wide chars in comments (#538)

go-yaml · May 4, 2020 · 5308cda · 5308cda
1 parent b1b19b4
commit 5308cda
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/node_test.go b/node_test.go
@@ -766,6 +766,22 @@ var nodeTests = []struct {
 		},
 	}, {
 
+		"# š\ntrue\n",
+		yaml.Node{
+			Kind:   yaml.DocumentNode,
+			Line:   2,
+			Column: 1,
+			Content: []*yaml.Node{{
+				Kind:        yaml.ScalarNode,
+				Value:       "true",
+				Tag:         "!!bool",
+				Line:        2,
+				Column:      1,
+				HeadComment: "# š",
+			}},
+		},
+	}, {
+
 		"[decode]\n# One\n\n# Two\n\n# Three\ntrue # Four\n# Five\n\n# Six\n\n# Seven\n",
 		yaml.Node{
 			Kind:        yaml.DocumentNode,

diff --git a/scannerc.go b/scannerc.go
@@ -2999,10 +2999,9 @@ func yaml_parser_scan_comments(parser *yaml_parser_t, scan_mark yaml_mark_t) boo
 					return false
 				}
 				skip_line(parser)
+			} else if parser.mark.index >= seen {
+				text = read(parser, text)
 			} else {
-				if parser.mark.index >= seen {
-					text = append(text, parser.buffer[parser.buffer_pos])
-				}
 				skip(parser)
 			}
 		}