Changeset 255 for trunk/python/pyregfi/__init__.py

Timestamp:

06/13/11 15:15:08 (13 years ago)

Author:

tim

Message:

fixed error condition deadlock in regfi
prevented early garbage collection of hive file handles
fixed module imports under python3

File:

• trunk/python/pyregfi/__init__.py (modified) (4 diffs)

trunk/python/pyregfi/__init__.py

@@ -258 +258 @@
     # Memory management for most regfi structures is taken care of here
     def __del__(self):
-        regfi.regfi_free_record(self._hive.file, self._base)
+        if self._base:
+            regfi.regfi_free_record(self._hive.file, self._base)
 
 
@@ -683 +684 @@
     file = None
     raw_file = None
-    _root = None
+    _fh = None
+    #_root = None
+
 
     ## The root Key of this Hive
@@ -723 +726 @@
         # The fileno method may not exist, or it may throw an exception
         # when called if the file isn't backed with a descriptor.
+        self._fh = fh
         fn = None
         try:
@@ -766 +770 @@
     
     def __del__(self):
-        regfi.regfi_free(self.file)
-        if self.raw_file != None:
-            self.raw_file = None
-
+        if self.file:
+            regfi.regfi_free(self.file)
 
     def __iter__(self):