commit 9ef0983c0bae704c261d15590bb4b43ef05434cc
author BogDan Vatra <bogdan@kdab.com> Mon Jan 04 14:05:49 2016 +0200
committer Mark Lobodzinski <mark@lunarg.com> Mon Jan 04 09:55:43 2016 -0700
tree d82ddb5e0de98c3968e556a83b2e063f5348c4b7
parent dcce0793deb237f21eb9918b83bca08a3bf281b2

loader: MR111, Fix memleaks

[instance|dev] activated_layer_list is always allocated so, we need to always free it.

loader/loader.c

diff --git a/loader/loader.c b/loader/loader.c
index eb24398..9ab4729 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1131,8 +1131,7 @@
                                           struct loader_device *dev)
 {
     loader_heap_free(inst, dev->app_extension_props);
-    if (dev->activated_layer_list.count)
-        loader_destroy_layer_list(inst, &dev->activated_layer_list);
+    loader_destroy_layer_list(inst, &dev->activated_layer_list);
     loader_heap_free(inst, dev);
 }
 
@@ -2730,10 +2729,6 @@
 
 void loader_deactivate_instance_layers(struct loader_instance *instance)
 {
-    if (!instance->activated_layer_list.count) {
-        return;
-    }
-
     /* Create instance chain of enabled layers */
     for (uint32_t i = 0; i < instance->activated_layer_list.count; i++) {
         struct loader_layer_properties *layer_prop = &instance->activated_layer_list.list[i];