Merge pull request #73 from cgkantidis/heap_buffer_overflow_fix

Author: dlidstrom

src/JsonExporter.cpp

@@ -22,6 +22,7 @@ void JsonExporter::WriteFooter(
     unsigned /*tot_dup_blocks*/,
     unsigned /*tot_dup_lines*/) {
     Out() << m_json.dump(2, ' ', true, nlohmann::json::error_handler_t::ignore);
+    Out() << '\n';
 }
 
 void JsonExporter::ReportSeq(
@@ -33,9 +34,9 @@ void JsonExporter::ReportSeq(
     int begin = line1;
     int end = line1 + count;
     int src_begin1 = source1.GetLine(line1).GetLineNumber();
-    int src_end1 = source1.GetLine(line1 + count).GetLineNumber();
+    int src_end1 = source1.GetLine(line1 + count - 1).GetLineNumber(); // inclusive
     int src_begin2 = source2.GetLine(line2).GetLineNumber();
-    int src_end2 = source2.GetLine(line2 + count).GetLineNumber();
+    int src_end2 = source2.GetLine(line2 + count - 1).GetLineNumber(); // inclusive
     m_json.emplace_back(nlohmann::json{
         { "LineCount", end - begin },
         { "SourceFile1", source1.GetFilename() },

src/XmlExporter.cpp

@@ -41,14 +41,14 @@ void XmlExporter::ReportSeq(
         << "    <set LineCount=\"" << count << "\">"
         << std::endl;
     int startLineNumber1 = source1.GetLine(line1).GetLineNumber();
-    int endLineNumber1 = source1.GetLine(line1 + count).GetLineNumber();
+    int endLineNumber1 = source1.GetLine(line1 + count - 1).GetLineNumber();
     Out()
         << "        <block SourceFile=\"" << source1.GetFilename()
         << "\" StartLineNumber=\"" << startLineNumber1
         << "\" EndLineNumber=\"" << endLineNumber1 << "\"/>"
         << std::endl;
     int startLineNumber2 = source2.GetLine(line2).GetLineNumber();
-    int endLineNumber2 = source2.GetLine(line2 + count).GetLineNumber();
+    int endLineNumber2 = source2.GetLine(line2 + count - 1).GetLineNumber();
     Out()
         << "        <block SourceFile=\"" << source2.GetFilename()
         << "\" StartLineNumber=\"" << startLineNumber2

tests/Simple/expected-json.log

@@ -1,7 +1,7 @@
 [
   {
-    "EndLineNumber1": 13,
-    "EndLineNumber2": 7,
+    "EndLineNumber1": 12,
+    "EndLineNumber2": 5,
     "LineCount": 5,
     "Lines": [
       "AAAAA",
@@ -15,4 +15,4 @@
     "StartLineNumber1": 7,
     "StartLineNumber2": 1
   }
-]
+]

tests/Simple/expected-xml.log

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <duplo>
     <set LineCount="5">
-        <block SourceFile="tests/Simple/LineNumbers.c" StartLineNumber="7" EndLineNumber="13"/>
-        <block SourceFile="tests/Simple/LineNumbers.c" StartLineNumber="1" EndLineNumber="7"/>
+        <block SourceFile="tests/Simple/LineNumbers.c" StartLineNumber="7" EndLineNumber="12"/>
+        <block SourceFile="tests/Simple/LineNumbers.c" StartLineNumber="1" EndLineNumber="5"/>
         <lines xml:space="preserve">
             <line Text="AAAAA"/>
             <line Text="BBBBB"/>