commit 3a0e3be74b818b547a7b98e87c980dbe9ceb3224
author Chia-I Wu <olvaffe@gmail.com> Wed Aug 06 12:08:44 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Wed Aug 06 12:08:57 2014 +0800
tree b395557fd97bac35b1d598826236f29d1cdc1233
parent 190ebdcce84b767d8db7a42383c834dc067b3e77

icd: fix driver reinit without alloc cb

icd/common/icd.c

diff --git a/icd/common/icd.c b/icd/common/icd.c
index 0d279f8..8750554 100644
--- a/icd/common/icd.c
+++ b/icd/common/icd.c
@@ -220,6 +220,13 @@
 XGL_RESULT icd_set_allocator(const XGL_ALLOC_CALLBACKS *alloc_cb)
 {
     if (icd.init_count) {
+        const XGL_ALLOC_CALLBACKS default_cb = {
+            NULL, default_alloc, default_free
+        };
+
+        if (!alloc_cb)
+            alloc_cb = &default_cb;
+
         /*
          * The spec says: Changing the callbacks on subsequent calls to
          * xglInitAndEnumerateGpus() causes it to fail with