frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leak in _sizeof implemented with _unserialize 

Signed-off-by: Peter Harris <pharris@opentext.com>
This commit is contained in:
Peter Harris 2010-09-10 15:51:56 -04:00
parent a22909c0f5
commit 28a71c6567
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/c_client.py
View File

@ -1134,8 +1134,7 @@ def _c_serialize(context, self):
return return
elif self.var_followed_by_fixed_fields: elif self.var_followed_by_fixed_fields:
# special case: call _unserialize() # special case: call _unserialize()
_c(' %s *_aux = NULL;', self.c_type) _c(' return %s(%s, NULL);', self.c_unserialize_name, reduce(lambda x,y: "%s, %s" % (x, y), param_names))
_c(' return %s(%s, &_aux);', self.c_unserialize_name, reduce(lambda x,y: "%s, %s" % (x, y), param_names))
_c('}') _c('}')
return return
else: else:
@ -1180,6 +1179,12 @@ def _c_serialize(context, self):
# allocate memory and copy everything into a continuous memory area # allocate memory and copy everything into a continuous memory area
# note: this is not necessary in case of unpack # note: this is not necessary in case of unpack
if context in ('serialize', 'unserialize'): if context in ('serialize', 'unserialize'):
# unserialize: check for sizeof-only invocation
if 'unserialize' == context:
_c('')
_c(' if (NULL == _aux)')
_c(' return xcb_buffer_len;')
_c('') _c('')
_c(' if (NULL == %s) {', aux_ptr) _c(' if (NULL == %s) {', aux_ptr)
_c(' /* allocate memory */') _c(' /* allocate memory */')