diff options
| author | Pavel Labath <labath@google.com> | 2016-08-31 07:49:37 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2016-08-31 07:49:37 +0000 |
| commit | 1e3b086749d4af4cdc44482d2b6da86ac40040db (patch) | |
| tree | d3c442a6f7d2dbaf28a7957c9ca3725ae19b5cca /lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | |
| parent | e4f590faeb10d288dc8821de56f4df14ff74d0e6 (diff) | |
| download | llvm-1e3b086749d4af4cdc44482d2b6da86ac40040db.zip llvm-1e3b086749d4af4cdc44482d2b6da86ac40040db.tar.gz llvm-1e3b086749d4af4cdc44482d2b6da86ac40040db.tar.bz2 | |
Revert r280200 and put it a proper fix
PeekChar returns a character, we want the whole string there.
llvm-svn: 280204
Diffstat (limited to 'lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp')
| -rw-r--r-- | lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index 49efeb8..17f136c 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -1620,7 +1620,7 @@ ParseMemoryRegionInfoFromProcMapsLine (const std::string &maps_line, MemoryRegio { memory_region_info.Clear(); - StringExtractor line_extractor (maps_line.c_str ()); + StringExtractor line_extractor (maps_line); // Format: {address_start_hex}-{address_end_hex} perms offset dev inode pathname // perms: rwxp (letter is present if set, '-' if not, final character is p=private, s=shared). @@ -1687,9 +1687,7 @@ ParseMemoryRegionInfoFromProcMapsLine (const std::string &maps_line, MemoryRegio line_extractor.GetU64(0, 10); // Read the inode number line_extractor.SkipSpaces(); - const char* name = line_extractor.PeekChar(); - if (name) - memory_region_info.SetName(name); + memory_region_info.SetName(line_extractor.Peek().str().c_str()); return Error (); } |
