Merged revisions 78642 via svnmerge from

Victor Stinner · Victor Stinner · commit da13545ebec9 · 2010-03-04T00:33:35.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78642 | victor.stinner | 2010-03-04 01:29:24 +0100 (jeu., 04 mars 2010) | 10 lines 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
@@ -100,6 +100,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler,
+  reset also the pointer to the current pointer context.
+
 - Issue #7250: Fix info leak of os.environ across multi-run uses of
   wsgiref.handlers.CGIHandler.
 
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -303,12 +303,17 @@ static void clearEntries(ProfilerObject *pObj)`
`303`	`303`	`{`
`304`	`304`	`RotatingTree_Enum(pObj->profilerEntries, freeEntry, NULL);`
`305`	`305`	`pObj->profilerEntries = EMPTY_ROTATING_TREE;`
`306`		`- /* release the memory hold by the free list of ProfilerContexts */`
	`306`	`+ /* release the memory hold by the ProfilerContexts */`
	`307`	`+ if (pObj->currentProfilerContext) {`
	`308`	`+ free(pObj->currentProfilerContext);`
	`309`	`+ pObj->currentProfilerContext = NULL;`
	`310`	`+ }`
`307`	`311`	`while (pObj->freelistProfilerContext) {`
`308`	`312`	`ProfilerContext *c = pObj->freelistProfilerContext;`
`309`	`313`	`pObj->freelistProfilerContext = c->previous;`
`310`	`314`	`free(c);`
`311`	`315`	`}`
	`316`	`+ pObj->freelistProfilerContext = NULL;`
`312`	`317`	`}`
`313`	`318`
`314`	`319`	`static void`