Fix bug #1565514, SystemError not raised on too many nested blocks.

It seems like this should be a different error than SystemError, but
I don't have any great ideas and SystemError was raised in 2.4 and earlier.

Will backport.

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 814303291907c733b2f8f75e7f7e0619e4752b89..f4522980984df2a918b01fa3cb05a76957fafd55 100644 (file)
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -336,6 +336,37 @@ isn't, there should be a syntax error.
    Traceback (most recent call last):
      ...
    SyntaxError: 'break' outside loop (<doctest test.test_syntax[42]>, line 3)
+
+This should probably raise a better error than a SystemError (or none at all).
+In 2.5 there was a missing exception and an assert was triggered in a debug
+build.  The number of blocks must be greater than CO_MAXBLOCKS.  SF #1565514
+
+   >>> while 1:
+   ...  while 2:
+   ...   while 3:
+   ...    while 4:
+   ...     while 5:
+   ...      while 6:
+   ...       while 8:
+   ...        while 9:
+   ...         while 10:
+   ...          while 11:
+   ...           while 12:
+   ...            while 13:
+   ...             while 14:
+   ...              while 15:
+   ...               while 16:
+   ...                while 17:
+   ...                 while 18:
+   ...                  while 19:
+   ...                   while 20:
+   ...                    while 21:
+   ...                     while 22:
+   ...                      break
+   Traceback (most recent call last):
+     ...
+   SystemError: too many statically nested blocks
+
 """
 
 import re

diff --git a/Misc/NEWS b/Misc/NEWS
index 05930e96da2fa35581f38dcecaa6c6c75b738bbd..fa287ea80fa8fec798d05ca285f37808329df71e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.6 alpha 1?
 Core and builtins
 -----------------
 
+- Bug #1565514, SystemError not raised on too many nested blocks.
+
 - Bug #1576174: WindowsError now displays the windows error code
   again, no longer the posix error code.
 

diff --git a/Python/compile.c b/Python/compile.c
index 374cf1c4ef5457d50d77c8d75ff696f7dd85d3c4..939c5edd0e8686321d60ab45b8ade6a695143f20 100644 (file)
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -3131,8 +3131,11 @@ static int
 compiler_push_fblock(struct compiler *c, enum fblocktype t, basicblock *b)
 {
        struct fblockinfo *f;
-       if (c->u->u_nfblocks >= CO_MAXBLOCKS)
+       if (c->u->u_nfblocks >= CO_MAXBLOCKS) {
+               PyErr_SetString(PyExc_SystemError,
+                               "too many statically nested blocks");
                return 0;
+       }
        f = &c->u->u_fblock[c->u->u_nfblocks++];
        f->fb_type = t;
        f->fb_block = b;