From: Jon Ashburn <jon@lunarg.com>
Date: Thu, 10 Mar 2016 21:21:09 +0000 (-0700)
Subject: layers: Fix helper script to not dereference strings with a NULL pointer.
X-Git-Tag: upstream/1.1.92~3605
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=108afcfec515867cb6015d5b90ce5210abab7f88;p=platform%2Fupstream%2FVulkan-Tools.git

layers: Fix helper script to not dereference strings with a NULL pointer.

Fixes the string helper functions.

Change-Id: I4177e498b734af9188088188a16a09aa2a6113b3
---

diff --git a/vk_helper.py b/vk_helper.py
index 05e104e..88f1fa2 100755
--- a/vk_helper.py
+++ b/vk_helper.py
@@ -1063,7 +1063,11 @@ class StructWrapperGen:
                         sh_funcs.append('        ss[%u].str("address");' % (index))
                     elif 'char' in self.struct_dict[s][m]['type'].lower() and self.struct_dict[s][m]['ptr']:
                         sh_funcs.append('%s' % lineinfo.get())
-                        sh_funcs.append('    ss[%u] << pStruct->%s;' % (index, self.struct_dict[s][m]['name']))
+                        sh_funcs.append('    if (pStruct->%s != NULL) {' % self.struct_dict[s][m]['name'])
+                        sh_funcs.append('        ss[%u] << pStruct->%s;' % (index, self.struct_dict[s][m]['name']))
+                        sh_funcs.append('     } else {')
+                        sh_funcs.append('        ss[%u] << "";' % index)
+                        sh_funcs.append('     }')
                     else:
                         sh_funcs.append('%s' % lineinfo.get())
                         (po, pa) = self._get_struct_print_formatted(self.struct_dict[s][m])