Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,8 @@ impl JsonRepairParser {
let mut needs_comma = false;

loop {
let pos_before = self.pos; // Safety check for infinite loops

self.skip_whitespace();
self.skip_comments();
self.skip_whitespace();
Expand Down Expand Up @@ -561,6 +563,12 @@ impl JsonRepairParser {
needs_comma = true;
}
}

// Safety check: ensure we're making progress
if self.pos == pos_before && self.pos < self.input.len() {
// We're stuck - advance one character to avoid infinite loop
self.advance();
}
}

self.pop_state();
Expand Down Expand Up @@ -810,6 +818,24 @@ mod tests {
assert_eq!(result, r#"[1,2,3]"#);
}

#[test]
fn test_array_with_colon_does_not_loop() {
let options = RepairOptions::default();

let result = repair_json(r#"{"filepath":"a","edits":[old_string":"x"#, &options).unwrap();
let parsed: Value = serde_json::from_str(&result).unwrap();
assert!(parsed.is_object());
}

#[test]
fn test_array_with_object_closer_does_not_loop() {
let options = RepairOptions::default();

let result = repair_json(r#"{"items":[}"#, &options).unwrap();
let parsed: Value = serde_json::from_str(&result).unwrap();
assert!(parsed.is_object());
}

#[test]
fn test_numbers() {
let options = RepairOptions::default();
Expand Down
Loading