From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 19 Aug 2010 09:09:04 +0000 (+0000)
Subject: Merged revisions 84172 via svnmerge from
X-Git-Tag: v2.7.1rc1~387
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6086b0dd95a2a829e83860f9dd090e6274c17132;p=python

Merged revisions 84172 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84172 | martin.v.loewis | 2010-08-18 18:12:23 +0200 (Mi, 18 Aug 2010) | 2 lines

  Restore GIL in nis_cat in case of error.
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index e8b68e0bab..29bc2767e3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.7.1?
 Core and Builtins
 -----------------
 
+- Restore GIL in nis_cat in case of error.
+
 - Issue #8530: Prevent stringlib fastsearch from reading beyond the front
   of an array.
 
diff --git a/Modules/nismodule.c b/Modules/nismodule.c
index 04d8570329..6acab63ddf 100644
--- a/Modules/nismodule.c
+++ b/Modules/nismodule.c
@@ -124,6 +124,7 @@ nis_foreach (int instatus, char *inkey, int inkeylen, char *inval,
             PyErr_Clear();
             Py_XDECREF(key);
             Py_XDECREF(val);
+            indata->state = PyEval_SaveThread();
             return 1;
         }
         err = PyDict_SetItem(indata->dict, key, val);