Fix device disposal

src/impl/sysfs.c

@@ -169,27 +169,21 @@ bool impl_sysfs_free(light_device_enumerator_t *enumerator)
             continue;
         }
         
-        // If the given device has a targets array that isnt NULL, iterate through it to free the targets, then free the array
-        if(curr_device->targets != NULL)
+        for(uint64_t t = 0; t < curr_device->num_targets; t++)
         {
-            for(uint64_t t = 0; t < curr_device->num_targets; t++)
+            light_device_target_t *curr_target = curr_device->targets[t];
+            
+            if(curr_target == NULL)
             {
-                light_device_target_t *curr_target = curr_device->targets[t];
-                
-                if(curr_target == NULL)
-                {
-                    continue;
-                }
-                
-                if(curr_target->device_target_data != NULL)
-                {
-                    free(curr_target->device_target_data);
-                }
-                
-                free(curr_target);
+                continue;
             }
             
-            free(curr_device->targets);
+            if(curr_target->device_target_data != NULL)
+            {
+                free(curr_target->device_target_data);
+            }
+            
+            free(curr_target);
         }
         
         // If the given device has any device_data, free it
@@ -197,16 +191,13 @@ bool impl_sysfs_free(light_device_enumerator_t *enumerator)
         {
             free(curr_device->device_data);
         }
-        
+                
+        light_dispose_device(curr_device);    
+
         // Free the device
         free(curr_device);
     }
     
-    // Free the devices array
-    free(enumerator->devices);
-    enumerator->devices = NULL;
-    enumerator->num_devices = 0;
-    
     return true;
 }
 

src/light.c

@@ -473,6 +473,17 @@ bool light_init_enumerators(light_context_t *ctx)
     return success;
 }
 
+void light_dispose_device(light_device_t *device)
+{
+    if(device->targets != NULL)
+    {
+        free(device->targets);
+        device->targets = NULL;
+    }
+    
+    device->num_targets = 0;
+}
+
 bool light_free_enumerators(light_context_t *ctx)
 {
     bool success = true;
@@ -483,6 +494,13 @@ bool light_free_enumerators(light_context_t *ctx)
         {
             success = false;
         }
+        
+        if(curr_enumerator->devices != NULL)
+        {
+            free(curr_enumerator->devices);
+            curr_enumerator->devices = NULL;
+        }
+        
         free(curr_enumerator);
     }
     

src/light.h

@@ -135,3 +135,6 @@ bool light_split_target_path(char const * in_path, light_target_path_t *out_path
 
 /* Returns the found device target, or null. Name should be enumerator/device/target */
 light_device_target_t* light_find_device_target(light_context_t *ctx, char const * name);
+
+/* Frees any runtime-allocated data inside a device. Call this before you free a device. */
+void light_dispose_device(light_device_t *device);