lda_controller: fix memory leak

2014-11-29 11:19:03 +08:00 · 2014-11-29 11:19:03 +08:00 · 9c41f98d70
parent 26180e7905
commit 9c41f98d70
1 changed files with 7 additions and 6 deletions
--- a/artiq/devices/lda/lda_controller.py
+++ b/artiq/devices/lda/lda_controller.py
@ -138,12 +138,13 @@ class Lda:
    def enumerate(cls, product):
        devs = hidapi.hid_enumerate(cls._vendor_id,
                                    cls._product_ids[product])
-        dev = devs
-        while dev:
-            yield dev[0].serial
-            dev = dev[0].next
-        yield None
-        hidapi.hid_free_enumeration(devs)
+        try:
+            dev = devs
+            while dev:
+                yield dev[0].serial
+                dev = dev[0].next
+        finally:
+            hidapi.hid_free_enumeration(devs)

    def _check_error(self, ret):
        if ret < 0: