From 951a43ea6c77436209c3dc974d8b18e5b2e87936 Mon Sep 17 00:00:00 2001
From: Philip <pipcet@gmail.com>
Date: Thu, 30 Apr 2015 21:31:32 +0000
Subject: [PATCH] fix a potential end-of-buffer issue in tccelf.c

also read characters one at a time when PARSE_DEBUG is set; after this
patch, things seem to work with that.
---
 tccelf.c | 7 +++++--
 tccpp.c  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tccelf.c b/tccelf.c
index 552a39f..581ebef 100644
--- a/tccelf.c
+++ b/tccelf.c
@@ -3275,6 +3275,11 @@ static int ld_next(TCCState *s1, char *name, int name_size)
             goto parse_name;
         }
         break;
+    case '\\':
+        ch = handle_eob();
+        if (ch != '\\')
+            goto redo;
+        /* fall through */
     /* case 'a' ... 'z': */
     case 'a':
        case 'b':
@@ -3330,7 +3335,6 @@ static int ld_next(TCCState *s1, char *name, int name_size)
        case 'Y':
        case 'Z':
     case '_':
-    case '\\':
     case '.':
     case '$':
     case '~':
@@ -3462,7 +3466,6 @@ ST_FUNC int tcc_load_ldscript(TCCState *s1)
     char filename[1024];
     int t, ret;
 
-    ch = file->buf_ptr[0];
     ch = handle_eob();
     for(;;) {
         t = ld_next(s1, cmd, sizeof(cmd));
diff --git a/tccpp.c b/tccpp.c
index b44296d..0a99832 100644
--- a/tccpp.c
+++ b/tccpp.c
@@ -386,7 +386,7 @@ static int tcc_peekc_slow(BufferedFile *bf)
     if (bf->buf_ptr >= bf->buf_end) {
         if (bf->fd != -1) {
 #if defined(PARSE_DEBUG)
-            len = 8;
+            len = 1;
 #else
             len = IO_BUF_SIZE;
 #endif