Commit 64d8956c authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r242306: 

------------------------------------------------------------------------
r242306 | dperchik | 2015-07-15 10:25:01 -0700 (Wed, 15 Jul 2015) | 10 lines

Fix -data-info-line when source includes column number.

This fixes an off-by-one bug in CMICmdCmdDataInfoLine::Acknowledge.  Given:
    LineEntry: \[0x0000000100000f37-0x0000000100000f45\): /path/to/file:123:1
-data-info-line would report the line as 12, omitting the last digit.

Reviewed by: ki.stfu, abidh
Subscribers: lldb-commits
Differential Revision: http://reviews.llvm.org/D11209

------------------------------------------------------------------------

llvm-svn: 242328
parent 68d0864f

lldb/tools/lldb-mi/MICmdCmdData.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1789,7 +1789,7 @@ CMICmdCmdDataInfoLine::Acknowledge(void) 
            //                                                                     ^ -- line

            const size_t nLineStartPos = nFileEndPos + 1;

            const size_t nLineEndPos = rLine.find(':', nLineStartPos);

            const size_t nLineLen = nLineEndPos != std::string::npos ? nLineEndPos - nLineStartPos - 1

            const size_t nLineLen = nLineEndPos != std::string::npos ? nLineEndPos - nLineStartPos

                                                                     : std::string::npos;

            const CMIUtilString strLine(rLine.substr(nLineStartPos, nLineLen).c_str());

            const CMICmnMIValueConst miValueConst4(strLine);