intel: Check for NULL pData on various calls and make sure dataSize is written
diff --git a/icd/intel/dev.c b/icd/intel/dev.c
index 91f8e07..6ef1ea5 100644
--- a/icd/intel/dev.c
+++ b/icd/intel/dev.c
@@ -365,8 +365,9 @@
 {
     struct intel_dev *dev = intel_dev(device);
 
-    intel_dev_get_heap_props(dev, pData);
     *pDataSize = sizeof(XGL_MEMORY_HEAP_PROPERTIES);
+    if (pData != NULL)
+        intel_dev_get_heap_props(dev, pData);
 
     return XGL_SUCCESS;
 }