summaryrefslogtreecommitdiffstats
path: root/Parser
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-01-27 18:55:54 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-01-27 18:55:54 (GMT)
commit412dc9c88f040abf4b23017c5e5e4d8b880d247d (patch)
treee10dee1ac8404c0d3362c48a4350d8e8389b7789 /Parser
parent661b0a15d78b8e86ea4b458550b1cb04f0988424 (diff)
downloadcpython-412dc9c88f040abf4b23017c5e5e4d8b880d247d.zip
cpython-412dc9c88f040abf4b23017c5e5e4d8b880d247d.tar.gz
cpython-412dc9c88f040abf4b23017c5e5e4d8b880d247d.tar.bz2
Merged revisions 60350-60363 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r60355 | neal.norwitz | 2008-01-27 18:10:14 +0100 (Sun, 27 Jan 2008) | 1 line Whitespace cleanup ........ r60356 | neal.norwitz | 2008-01-27 18:10:29 +0100 (Sun, 27 Jan 2008) | 1 line Add assertion that we do not blow out newl ........ r60357 | neal.norwitz | 2008-01-27 18:10:35 +0100 (Sun, 27 Jan 2008) | 1 line Initialize variable to prevent warning on some platform/config. ........ r60358 | neal.norwitz | 2008-01-27 18:10:43 +0100 (Sun, 27 Jan 2008) | 1 line Update to newer version of ffi. Fixes crashes and test failures of longdouble ........ r60359 | neal.norwitz | 2008-01-27 18:10:50 +0100 (Sun, 27 Jan 2008) | 1 line Add a tiny sleep and additional flush to force the file to really be synced. ........ r60360 | neal.norwitz | 2008-01-27 18:10:58 +0100 (Sun, 27 Jan 2008) | 1 line Retry connection in case it fails to reduce flakiness ........ r60361 | neal.norwitz | 2008-01-27 18:11:11 +0100 (Sun, 27 Jan 2008) | 4 lines Catch socket errors that are often the cause of transient failures. Many of these exceptions are due to resource unavailable, so the existing code should be able to handle many more spurious errors. ........ r60362 | neal.norwitz | 2008-01-27 18:12:15 +0100 (Sun, 27 Jan 2008) | 1 line Reduce buffer size since we do not need 1k ........ r60363 | neal.norwitz | 2008-01-27 18:13:07 +0100 (Sun, 27 Jan 2008) | 1 line Print periodic "still working" messages since this suite is slow. ........
Diffstat (limited to 'Parser')
-rw-r--r--Parser/tokenizer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 991d760..2833e53 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -657,6 +657,7 @@ decode_str(const char *str, struct tok_state *tok)
for (s = str;; s++) {
if (*s == '\0') break;
else if (*s == '\n') {
+ assert(lineno < 2);
newl[lineno] = s;
lineno++;
if (lineno == 2) break;