merge 3.5 (#24022)

benjaminp · benjaminp · commit f5e8e8fc2b66 · 2016-09-18T23:44:02.000-07:00
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -1025,7 +1025,7 @@ tok_nextc(struct tok_state *tok)`
`1025`	`1025`	`else {`
`1026`	`1026`	`tok->done = E_OK;`
`1027`	`1027`	`tok->inp = strchr(tok->buf, '\0');`
`1028`		`- done = tok->inp[-1] == '\n';`
	`1028`	`+ done = tok->inp == tok->buf \|\| tok->inp[-1] == '\n';`
`1029`	`1029`	`}`
`1030`	`1030`	`}`
`1031`	`1031`	`else {`