Skip to content

fix(read): correct file offset calculation for CRLF line endings #4349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(read): correct file offset calculation for CRLF line endings #4349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfef0a4
fix(read): correct file offset calculation for CRLF line endings
gaborbernat Nov 13, 2025
e6fbe41
fix: ensure consistent offset calculation between binary search and l…
gaborbernat Nov 13, 2025
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
1 change: 1 addition & 0 deletions Units/parser-html.r/file-offset-crlf-crash.d/.gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/input.html binary
1 change: 1 addition & 0 deletions Units/parser-html.r/file-offset-crlf-crash.d/args.ctags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--sort=no
Empty file added Units/parser-html.r/file-offset-crlf-crash.d/expected.tags
View file
Open in desktop
Empty file.
2 changes: 2 additions & 0 deletions Units/parser-html.r/file-offset-crlf-crash.d/input.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

<body><p>Hi</p>
39 changes: 35 additions & 4 deletions main/read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,20 @@ extern MIOPos getInputFilePositionForLine (unsigned int line)
extern long getInputFileOffsetForLine (unsigned int line)
{
compoundPos *cpos = getInputFileCompoundPosForLine (line);
long r = cpos->offset - (File.bomFound? 3: 0) - cpos->crAdjustment;
long bomOffset = File.bomFound ? 3 : 0;

// The position stored for this line was captured before processing this line's CRLF,
// but crAdjustment includes this line's CRLF. Use previous line's adjustment.
long relevantCrAdjustment = 0;
if (line > 1) {
// For line N > 1, use adjustment from line N-1
compoundPos *prevCpos = getInputFileCompoundPosForLine(line - 1);
relevantCrAdjustment = prevCpos->crAdjustment;
}

long r = cpos->offset - bomOffset - relevantCrAdjustment;
Assert (r >= 0);

return r;
}

Expand Down Expand Up @@ -608,11 +620,30 @@ static int compoundPosForOffset (const void* oft, const void *p)
const compoundPos *pos = p;
const compoundPos *next = (compoundPos *)(((char *)pos) + sizeof (compoundPos));

if (offset < (pos->offset - pos->crAdjustment))
// For consistency with getInputFileOffsetForLine, use previous line's crAdjustment
// for position calculation to account for timing mismatch
long relevantCrAdjustment = 0;
if (pos > File.lineFposMap.pos) {
// Not the first position, use previous position's crAdjustment
const compoundPos *prevPos = pos - 1;
relevantCrAdjustment = prevPos->crAdjustment;
}

long nextRelevantCrAdjustment = 0;
if (next <= File.lineFposMap.pos + File.lineFposMap.count - 1) {
// Not past the last position
if (next > File.lineFposMap.pos) {
// Not the first position, use previous position's crAdjustment
const compoundPos *nextPrevPos = next - 1;
nextRelevantCrAdjustment = nextPrevPos->crAdjustment;
}
}

if (offset < (pos->offset - relevantCrAdjustment))
return -1;
else if (((pos->offset - pos->crAdjustment) <= offset)
else if (((pos->offset - relevantCrAdjustment) <= offset)
&& (pos->open
|| (offset < (next->offset - next->crAdjustment))))
|| (offset < (next->offset - nextRelevantCrAdjustment))))
return 0;
else
return 1;
Expand Down
Loading