fixup! json-{sarif,simple}: propagate endLine/endColumn

Author: kdudka

src/lib/defect.hh

@@ -55,8 +55,9 @@ struct DefEvent {
     /// 0 = key event,  1 = info event,  2 = trace event
     int                 verbosityLevel  = 0;
 
-    short               hSize           = 0; //< endColumn - startColumn
-    short               vSize           = 0; //< endLine - startLine
+    using TNumDiff = unsigned short;
+    TNumDiff            hSize           = 0; //< endColumn - startColumn
+    TNumDiff            vSize           = 0; //< endLine - startLine
 
     DefEvent() { }
 
@@ -67,10 +68,10 @@ struct DefEvent {
 };
 
 ///< return (end - beg) if it is positive and fits into `short`, 0 otherwise
-inline short diffNums(const int beg, const int end)
+inline DefEvent::TNumDiff diffNums(const int beg, const int end)
 {
     const int diff = end - beg;
-    return (0 < diff && diff < std::numeric_limits<short>::max())
+    return (0 < diff && diff < std::numeric_limits<DefEvent::TNumDiff>::max())
         ? diff
         : 0;
 }

src/lib/parser-json-simple.cc

@@ -136,15 +136,17 @@ bool SimpleTreeDecoder::readNode(Defect *def)
     TEvtList &evtListDst = def->events;
     const pt::ptree &evtListSrc = defNode.get_child("events");
     for (const pt::ptree::value_type &evtItem : evtListSrc) {
+        using TNumDiff = DefEvent::TNumDiff;
+
         const pt::ptree &evtNode = evtItem.second;
         d->reportUnknownNodes(Private::NK_EVENT, evtNode);
 
         DefEvent evt;
         evt.fileName    = valueOf<std::string   >(evtNode, "file_name");
         evt.line        = valueOf<int           >(evtNode, "line");
         evt.column      = valueOf<int           >(evtNode, "column");
-        evt.hSize       = valueOf<short         >(evtNode, "h_size");
-        evt.vSize       = valueOf<short         >(evtNode, "v_size");
+        evt.hSize       = valueOf<TNumDiff      >(evtNode, "h_size");
+        evt.vSize       = valueOf<TNumDiff      >(evtNode, "v_size");
         evt.event       = valueOf<std::string   >(evtNode, "event");
         evt.msg         = valueOf<std::string   >(evtNode, "message");
         evt.verbosityLevel = valueOf<int>(evtNode, "verbosity_level", -1);