toml: fix handling of multiline string with CRLF (fix #24321) (#24322)

kbkpbot · web-flow · commit b87aed84e3b2 · 2025-04-26T07:59:18.000+03:00
diff --git a/vlib/toml/scanner/scanner.v b/vlib/toml/scanner/scanner.v
@@ -486,6 +486,9 @@ fn (mut s Scanner) extract_multiline_string() !string {
 		c := u8(s.at())
 		util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'c: `${c.ascii_str()}` / ${c} (quote type: ${quote}/${quote.ascii_str()})')
 
+		if c == `\r` {
+			continue
+		}
 		if c == `\n` {
 			s.inc_line_number()
 			lit += c.ascii_str()
diff --git a/vlib/toml/scanner/scanner_test.v b/vlib/toml/scanner/scanner_test.v
@@ -80,3 +80,16 @@ fn test_reset() {
 	s.reset()
 	assert s.next() == `a`
 }
+
+const multiline_string_input = input.Config{
+	text: '"""abc\r\ndef\n123"""'
+}
+
+fn test_multiline_string() {
+	mut s := scanner.new_scanner(input: multiline_string_input) or { panic(err) }
+	tok := s.scan()!
+	assert tok.kind == .quoted
+	assert tok.lit.contains('abc')
+	assert tok.lit.contains('def')
+	assert tok.lit.contains('123')
+}
