From: Peter Johnson <peter@tortall.net>
Date: Sun, 1 Aug 2010 17:44:56 +0000 (-0000)
Subject: Fix #213: Fix gas-preproc misuse of strcpy() and uninitialized variables.
X-Git-Tag: v1.1.0~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d3b3797e57cd7ed5f5810246dbb17ea29e68d94;p=yasm

Fix #213: Fix gas-preproc misuse of strcpy() and uninitialized variables.

- strcpy() was being used with overlapping memory ranges; switched to memmove().
- bline->line_number was not set in one location.

Exact causes identified using valgrind.

svn path=/trunk/yasm/; revision=2348
---

diff --git a/modules/preprocs/gas/gas-preproc.c b/modules/preprocs/gas/gas-preproc.c
index bbdd4992..86060d74 100644
--- a/modules/preprocs/gas/gas-preproc.c
+++ b/modules/preprocs/gas/gas-preproc.c
@@ -792,7 +792,7 @@ static void expand_macro(yasm_preproc_gas *pp, macro_entry *macro, const char *a
                                 memcpy(line + cursor - len, value, value_length);
                             } else {
                                 memcpy(line + cursor - len, value, value_length);
-                                strcpy(line + cursor - len + value_length, line + cursor);
+                                memmove(line + cursor - len + value_length, line + cursor, strlen(line + cursor) + 1);
                             }
                             pp->expr_string = work = line;
                             pp->expr_string_cursor += delta;
@@ -806,6 +806,7 @@ static void expand_macro(yasm_preproc_gas *pp, macro_entry *macro, const char *a
         }
 
         bline->line = work + (pp->expr_string - work);
+        bline->line_number = -1;
         pp->expr_string = NULL;
 
         if (prev_bline) {
@@ -928,7 +929,7 @@ static void kill_comments(yasm_preproc_gas *pp, char *line)
             return;
         }
 
-        strcpy(cstart, cend + 2);
+        memmove(cstart, cend + 2, strlen(cend + 2) + 1);
         pp->in_comment = FALSE;
         cstart = strstr(cstart, "/*");
         next = 2;
@@ -963,7 +964,7 @@ static void substitute_values(yasm_preproc_gas *pp, char *line)
                     memcpy(line + cursor - len, value, value_length);
                 } else {
                     memcpy(line + cursor - len, value, value_length);
-                    strcpy(line + cursor - len + value_length, line + cursor);
+                    memmove(line + cursor - len + value_length, line + cursor, strlen(line + cursor) + 1);
                 }
                 pp->expr_string = line;
                 pp->expr_string_cursor = cursor + delta;