merge 3.5 (#24022)

f5e8e8fc · Benjamin Peterson · 6692f01c · 57bda335 · f5e8e8fc
Kaydet (Commit) f5e8e8fc authored Eyl 19, 2016 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

tokenizer.c Parser/tokenizer.c +1 -1

No files found.
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -1025,7 +1025,7 @@ tok_nextc(struct tok_state *tok)
                else {
                    tok->done = E_OK;
                    tok->inp = strchr(tok->buf, '\0');
-                    done = tok->inp[-1] == '\n';
+                    done = tok->inp == tok->buf || tok->inp[-1] == '\n';
                }
            }
            else {