Skip to content

Commit 452afa2

Browse files
committed
Correct multiline raw UTF-8 error positions and simplify indexing
Assisted-by: OpenAI Codex
1 parent e759c5b commit 452afa2

2 files changed

Lines changed: 42 additions & 12 deletions

File tree

‎src/read.rs‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ where
155155
ch: Option<u8>,
156156
#[cfg(feature = "raw_value")]
157157
raw_buffer: Option<Vec<u8>>,
158+
#[cfg(feature = "raw_value")]
159+
raw_buffering_start_position: Position,
158160
}
159161

160162
/// JSON input source that reads from a slice of bytes.
@@ -203,6 +205,8 @@ where
203205
ch: None,
204206
#[cfg(feature = "raw_value")]
205207
raw_buffer: None,
208+
#[cfg(feature = "raw_value")]
209+
raw_buffering_start_position: Position { line: 1, column: 0 },
206210
}
207211
}
208212
}
@@ -378,6 +382,12 @@ where
378382

379383
#[cfg(feature = "raw_value")]
380384
fn begin_raw_buffering(&mut self) {
385+
let position = self.position();
386+
// A peeked byte has advanced the iterator but is not buffered yet.
387+
self.raw_buffering_start_position = Position {
388+
line: position.line,
389+
column: position.column - usize::from(self.ch.is_some()),
390+
};
381391
self.raw_buffer = Some(Vec::new());
382392
}
383393

@@ -390,14 +400,17 @@ where
390400
let raw = match String::from_utf8(raw) {
391401
Ok(raw) => raw,
392402
Err(err) => {
393-
let utf8 = err.utf8_error();
394-
let bytes = err.as_bytes();
395-
let position = self.position();
396-
let back = bytes.len() - utf8.valid_up_to();
403+
let prefix = &err.as_bytes()[..err.utf8_error().valid_up_to() + 1];
404+
let line = self.raw_buffering_start_position.line
405+
+ memchr::memchr_iter(b'\n', prefix).count();
406+
let column = match memchr::memrchr(b'\n', prefix) {
407+
Some(index) => prefix.len() - index - 1,
408+
None => self.raw_buffering_start_position.column + prefix.len(),
409+
};
397410
return Err(Error::syntax(
398411
ErrorCode::InvalidUnicodeCodePoint,
399-
position.line,
400-
position.column.saturating_sub(back.saturating_sub(1)),
412+
line,
413+
column,
401414
));
402415
}
403416
};
@@ -658,12 +671,7 @@ impl<'a> Read<'a> for SliceRead<'a> {
658671
let raw = match str::from_utf8(raw) {
659672
Ok(raw) => raw,
660673
Err(err) => {
661-
let at = cmp::min(
662-
self.raw_buffering_start_index
663-
.saturating_add(err.valid_up_to())
664-
.saturating_add(1),
665-
self.slice.len(),
666-
);
674+
let at = self.raw_buffering_start_index + err.valid_up_to() + 1;
667675
let position = self.position_of_index(at);
668676
return Err(Error::syntax(
669677
ErrorCode::InvalidUnicodeCodePoint,

‎tests/regression/issue1083.rs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,25 @@ fn invalid_utf8_raw_value_matches_value() {
5757
assert_eq!(value_err.to_string(), raw_reader_err.to_string());
5858
}
5959
}
60+
61+
#[cfg(feature = "raw_value")]
62+
#[test]
63+
fn invalid_utf8_in_multiline_raw_value() {
64+
for (input, line, column) in [
65+
(b"[\n \"\xff\",\n 0\n]".as_slice(), 2, 3),
66+
(b" \n [\"\xff\",\n 0\n]".as_slice(), 2, 5),
67+
] {
68+
let err = serde_json::from_slice::<Box<serde_json::value::RawValue>>(input)
69+
.unwrap_err();
70+
assert_eq!((err.line(), err.column()), (line, column));
71+
72+
#[cfg(feature = "std")]
73+
{
74+
let err = serde_json::from_reader::<_, Box<serde_json::value::RawValue>>(
75+
std::io::Cursor::new(input),
76+
)
77+
.unwrap_err();
78+
assert_eq!((err.line(), err.column()), (line, column));
79+
}
80+
}
81+
}

0 commit comments

Comments
 (0)