From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 4 Mar 2010 00:29:24 +0000 (+0000)
Subject: Merged revisions 78641 via svnmerge from
X-Git-Tag: v3.2a1~1577
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cee3ae8af603dd516e81472f87ab358bc890197a;p=python

Merged revisions 78641 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78641 | victor.stinner | 2010-03-04 01:10:12 +0100 (jeu., 04 mars 2010) | 3 lines

  Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler,
  reset also the pointer to the current pointer context.
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index b23a60a62f..3165733c4c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -268,6 +268,9 @@ C-API
 Library
 -------
 
+- Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler,
+  reset also the pointer to the current pointer context.
+
 - Issue #7232: Add support for the context manager protocol to the TarFile
   class.
 
diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c
index 43cb9b1242..a4951c033b 100644
--- a/Modules/_lsprof.c
+++ b/Modules/_lsprof.c
@@ -303,12 +303,17 @@ static void clearEntries(ProfilerObject *pObj)
 {
 	RotatingTree_Enum(pObj->profilerEntries, freeEntry, NULL);
 	pObj->profilerEntries = EMPTY_ROTATING_TREE;
-	/* release the memory hold by the free list of ProfilerContexts */
+	/* release the memory hold by the ProfilerContexts */
+	if (pObj->currentProfilerContext) {
+		free(pObj->currentProfilerContext);
+		pObj->currentProfilerContext = NULL;
+	}
 	while (pObj->freelistProfilerContext) {
 		ProfilerContext *c = pObj->freelistProfilerContext;
 		pObj->freelistProfilerContext = c->previous;
 		free(c);
 	}
+	pObj->freelistProfilerContext = NULL;
 }
 
 static void