doc/CHANGES.txt

@@ -51,6 +51,8 @@ Zope Changes
 
     Bugs fixed
 
+      - Collector #1655: fixed severe memory leak in TemporaryStorage
+
       - Collector #1407: fixed XML escaping problem introduced in 2.7.4 b1
 
       - Collector #1151: HTTP compression was broken on error pages

lib/python/tempstorage/TemporaryStorage.py

@@ -271,7 +271,9 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
         while roids:
             roid = roids.pop(0)
             # decrement refcnt:
-            rc=referenceCount_get(roid, 0)
+            # DM 2005-01-07: decrement *before* you make the test!
+            # rc=referenceCount_get(roid, 0)
+            rc=referenceCount_get(roid, 0) - 1
             if rc==0:
                 self._takeOutGarbage(roid)
             elif rc < 0:
@@ -280,7 +282,9 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
                     (ReferenceCountError.__doc__,`roid`,rc)
                     )
             else:
-                referenceCount[roid] = rc - 1
+                # DM 2005-01-07: decremented *before* the test! see above
+                #referenceCount[roid] = rc - 1
+                referenceCount[roid] = rc
         try: del self._oreferences[oid]
         except: pass