Skip to content

Commit 5caac38

Browse files
committed
Fix off-by-one error when getting the last line of the block in XmlExporter
1 parent 1111717 commit 5caac38

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/XmlExporter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ void XmlExporter::ReportSeq(
3939
<< " <set LineCount=\"" << count << "\">"
4040
<< std::endl;
4141
int startLineNumber1 = source1.GetLine(line1).GetLineNumber();
42-
int endLineNumber1 = source1.GetLine(line1 + count).GetLineNumber();
42+
int endLineNumber1 = source1.GetLine(line1 + count - 1).GetLineNumber();
4343
Out()
4444
<< " <block SourceFile=\"" << source1.GetFilename()
4545
<< "\" StartLineNumber=\"" << startLineNumber1
4646
<< "\" EndLineNumber=\"" << endLineNumber1 << "\"/>"
4747
<< std::endl;
4848
int startLineNumber2 = source2.GetLine(line2).GetLineNumber();
49-
int endLineNumber2 = source2.GetLine(line2 + count).GetLineNumber();
49+
int endLineNumber2 = source2.GetLine(line2 + count - 1).GetLineNumber();
5050
Out()
5151
<< " <block SourceFile=\"" << source2.GetFilename()
5252
<< "\" StartLineNumber=\"" << startLineNumber2

tests/Simple/expected-xml.log

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<duplo>
33
<set LineCount="5">
4-
<block SourceFile="tests/Simple/LineNumbers.c" StartLineNumber="7" EndLineNumber="13"/>
5-
<block SourceFile="tests/Simple/LineNumbers.c" StartLineNumber="1" EndLineNumber="7"/>
4+
<block SourceFile="tests/Simple/LineNumbers.c" StartLineNumber="7" EndLineNumber="12"/>
5+
<block SourceFile="tests/Simple/LineNumbers.c" StartLineNumber="1" EndLineNumber="5"/>
66
<lines xml:space="preserve">
77
<line Text="AAAAA"/>
88
<line Text="BBBBB"/>

0 commit comments

Comments
 (0)