merge 3.3 (#19098)

diff --cc Misc/NEWS
index f39bd88e7e78285d7c5fef12b6febb6414d5a826,e7910f3365f09f535aaff583c140f4606228027d..a2b230dc1b18856f2ca8c7383cc39264b525ecf8
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -7,21 -12,66 +7,24 @@@ Projected Release date: 2013-09-2
  Core and Builtins
  -----------------
  
 -- Issue #18942: sys._debugmallocstats() output was damaged on Windows.
 -
 -- Issue #18667: Add missing "HAVE_FCHOWNAT" symbol to posix._have_functions.
 -
 -- Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
 -  fails.
 -
 -- Issue #16741: Fix an error reporting in int().
 -
 -- Issue #17899: Fix rare file descriptor leak in os.listdir().
 -
 -- Issue #18552: Check return value of PyArena_AddPyObject() in
 -  obj2ast_object().
 -
 -- Issue #18560: Fix potential NULL pointer dereference in sum().
 -
 -- Issue #15905: Fix theoretical buffer overflow in handling of sys.argv[0],
 -  prefix and exec_prefix if the operation system does not obey MAXPATHLEN.
 -
 -- Issue #18344: Fix potential ref-leaks in _bufferedreader_read_all().
 -
 -- Issue #17872: Fix a segfault in marshal.load() when input stream returns
 -  more bytes than requested.
 -
 -- Issue #18426: Fix NULL pointer dereference in C extension import when
 -  PyModule_GetDef() returns an error.
 -
 -- Issue #18328: Reorder ops in PyThreadState_Delete*() functions. Now the
 -  tstate is first removed from TLS and then deallocated.
 -
 -- Issue #18184: PyUnicode_FromFormat() and PyUnicode_FromFormatV() now raise
 -  OverflowError when an argument of %c format is out of range.
 -
 -- Issue #18137: Detect integer overflow on precision in float.__format__()
 -  and complex.__format__().
 -
 -- Issue #18183: Fix various unicode operations on strings with large unicode
 -  codepoints.
 -
 -- Issue #18180: Fix ref leak in _PyImport_GetDynLoadWindows().
 -
 -- Issue #18038: SyntaxError raised during compilation sources with illegal
 -  encoding now always contains an encoding name.
 -
 -- Issue #17644: Fix a crash in str.format when curly braces are used in square
 -  brackets.
 +- Issue #18818: The "encodingname" part of PYTHONIOENCODING is now optional.
 +
+ - Issue #19098: Prevent overflow in the compiler when the recursion limit is set
+   absurbly high.
+ 
 +Library
 +-------
  
 -- Issue #17983: Raise a SyntaxError for a ``global __class__`` statement in a
 -  class body.
 +- Issue #18996: TestCase.assertEqual() now more cleverly shorten differing
 +  strings in error report.
  
 -- Issue #17927: Frame objects kept arguments alive if they had been copied into
 -  a cell, even if the cell was cleared.
 +- Issue #19034: repr() for tkinter.Tcl_Obj now exposes string reperesentation.
  
 -Library
 --------
 +- Issue #18978: ``urllib.request.Request`` now allows the method to be
 +  indicated on the class and no longer sets it to None in ``__init__``.
  
 -- Issue #19028: Fixed tkinter.Tkapp.merge() for non-string arguments.
 +- Issue #18626: the inspect module now offers a basic command line
 +  introspection interface (Initial patch by Claudiu Popa)
  
  - Issue #3015: Fixed tkinter with wantobject=False.  Any Tcl command call
    returned empty string.

diff --cc Python/symtable.c
index 618a81442bcac91c0842b9b135707ad10e8e77c9,1e13b790de3d01e7d8702b579620cca02a6a954d..da164aa877d3201d58f2c63590958770ef507690
--- 1/Python/symtable.c
--- 2/Python/symtable.c
+++ b/Python/symtable.c
@@@ -239,14 -239,10 +239,15 @@@ PySymtable_BuildObject(mod_ty mod, PyOb
      asdl_seq *seq;
      int i;
      PyThreadState *tstate;
+     int recursion_limit = Py_GetRecursionLimit();
  
      if (st == NULL)
 -        return st;
 +        return NULL;
 +    if (filename == NULL) {
 +        PySymtable_Free(st);
 +        return NULL;
 +    }
 +    Py_INCREF(filename);
      st->st_filename = filename;
      st->st_future = future;