Order of keywords on the keyword table was wrong

[cc65] / src / cc65 / lineinfo.c

diff --git a/src/cc65/lineinfo.c b/src/cc65/lineinfo.c
index 60ba962efb19e5e210be73b7fbffb700604f71d3..342eeaced00cf80ae9dc81a92af628f88fb6d3c2 100644 (file)
--- a/src/cc65/lineinfo.c
+++ b/src/cc65/lineinfo.c
@@ -69,7 +69,7 @@ static LineInfo* NewLineInfo (struct IFile* F, unsigned LineNum, const char* Lin
 {
     unsigned  Len;
     LineInfo* LI;
-    char*     S;
+    char*     T;
 
     /* Skip leading spaces in Line */
     while (IsBlank (*Line)) {
@@ -86,20 +86,25 @@ static LineInfo* NewLineInfo (struct IFile* F, unsigned LineNum, const char* Lin
     LI->RefCount  = 1;
     LI->InputFile = F;
     LI->LineNum   = LineNum;
-    memcpy (LI->Line, Line, Len+1);
 
-    /* Replace tabs by spaces in the given line since tabs will give rather
-     * arbitrary results when used in the output later, and if we do it here,
-     * we won't need another copy.
+    /* Copy the line, replacing tabs by spaces in the given line since tabs
+     * will give rather arbitrary results when used in the output later, and
+     * if we do it here, we won't need another copy later.
      */
-    S = LI->Line;
-    while (*S) {
-       if (*S == '\t') {
-           *S = ' ';
+    T = LI->Line;
+    while (Len--) {
+               if (*Line == '\t') {
+           *T = ' ';
+       } else {
+           *T = *Line;
        }
-       ++S;
+       ++Line;
+       ++T;
     }
 
+    /* Add the terminator */
+    *T = '\0';
+
     /* Return the new struct */
     return LI;
 }