X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fc_client.py;h=a66c7e311b33c94443b1472de08af1f75d8da165;hb=8c1d2021ca611c1452a8d2ff2a705569e4ebd056;hp=08d6ec40e8946a2bd2f9f22123d88e666c2e5652;hpb=28a71c6567d08272dc9c1c2b32f0529f11f62b9e;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/c_client.py b/src/c_client.py
index 08d6ec4..a66c7e3 100644
--- a/src/c_client.py
+++ b/src/c_client.py
@@ -1218,12 +1218,13 @@ def _c_serialize(context, self):
             
         # unserialize: assign variable size fields individually
         if 'unserialize' == context:
-            _c('    *%s = xcb_out;', aux_ptr)
-            _c('    xcb_tmp = (char *)(*_aux+1);')
+            _c('    xcb_tmp = ((char *)*_aux)+xcb_buffer_len;')
+            param_fields.reverse()
             for field in param_fields:
                 if not field.type.fixed_size():
-                    _c('    memcpy(xcb_tmp, %s, %s_len);', field.c_field_name, field.c_field_name)
-                    _c('    xcb_tmp += %s_len;', field.c_field_name)
+                    _c('    xcb_tmp -= %s_len;', field.c_field_name)
+                    _c('    memmove(xcb_tmp, %s, %s_len);', field.c_field_name, field.c_field_name)
+            _c('    *%s = xcb_out;', aux_ptr)
  
     _c('')
     _c('    return xcb_buffer_len;')