[CLI] List command bugs fixed:

1. No output for uncompressed source files.
2. Garbage output after the end of source file.
3. Incorrect line counter work at the bottom of source file.

diff --git a/src/managed/SymbolReader.cs b/src/managed/SymbolReader.cs
index ad2523fd587439c9aeb8ccb364672e0f2ecbb354..fe0b35fad1b717d13d2a01a1a23fed9b83c42c78 100644 (file)
--- a/src/managed/SymbolReader.cs
+++ b/src/managed/SymbolReader.cs
@@ -1553,6 +1553,10 @@ namespace NetCoreDbg
 
                 stream = decompressed;
             }
+            else
+            {
+                docSize = bytes.Length - sizeof(int);
+            }
             return stream;
         }
     }

diff --git a/src/protocols/cliprotocol.cpp b/src/protocols/cliprotocol.cpp
index aea0c50fd19ce3bb6143968d76b9d98e6af003ef..5b2ca2f57b127281c9a7f0c19e6737ec7cdc591f 100644 (file)
--- a/src/protocols/cliprotocol.cpp
+++ b/src/protocols/cliprotocol.cpp
@@ -1486,6 +1486,8 @@ HRESULT CLIProtocol::doCommand<CommandTag::List>(const std::vector<std::string>
                 else
                     printf("   %d\t%s\n", line,  toPrint);
             }
+            else
+                break; // end of file
         }
         m_sourceLine = line;
     }

diff --git a/src/protocols/sourcestorage.cpp b/src/protocols/sourcestorage.cpp
index a371289bd8578495a8fe186e764163d2f72b8937..2342fdbb89ea344368fc9b6845133f3b2567b22e 100644 (file)
--- a/src/protocols/sourcestorage.cpp
+++ b/src/protocols/sourcestorage.cpp
@@ -60,7 +60,7 @@ namespace netcoredbg
         sf->text = fileBuff;
 
         sf->lines.push_back(NULL); // The lines count begins from 1, the 0th line is empty
-        for(char* bufptr = sf->text; bufptr <= sf->text + fileLen; )
+        for(char* bufptr = sf->text; bufptr < sf->text + fileLen; )
         {
             sf->lines.push_back(bufptr);
             while(*bufptr != '\r')