diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-07-01 16:45:04 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-07-01 16:45:04 +0200 |
| commit | 4c74e73e1da95db388a57ef05900b7b7a65dd32b (patch) | |
| tree | 1fba907270edcdf4335e55ddc9bc264fa9d0ffa5 | |
| parent | 007d12897362572809dfe523fa30b373c31a28fa (diff) | |
| download | spice-4c74e73e1da95db388a57ef05900b7b7a65dd32b.tar.gz spice-4c74e73e1da95db388a57ef05900b7b7a65dd32b.tar.xz spice-4c74e73e1da95db388a57ef05900b7b7a65dd32b.zip | |
Fix 32bit failure in demarshaller
Due to a typo we always read offsets as pointers, never as SPICE_ADDRESS.
| -rw-r--r-- | python_modules/demarshal.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python_modules/demarshal.py b/python_modules/demarshal.py index b8195134..023c3f60 100644 --- a/python_modules/demarshal.py +++ b/python_modules/demarshal.py @@ -837,14 +837,14 @@ def write_ptr_info_check(writer): is_ptr = "ptr_info[%s].is_ptr" % index dest = "ptr_info[%s].dest" % index with writer.if_block("%s == 0" % offset, newline=False): - with writer.if_block("%s == 0" % is_ptr, newline=False): + with writer.if_block(is_ptr, newline=False): writer.assign("*(void **)(%s)" % dest, "NULL") with writer.block(" else"): writer.assign("*(SPICE_ADDRESS *)(%s)" % dest, "0") with writer.block(" else"): writer.comment("Align to 32 bit").newline() writer.assign("end", "(uint8_t *)SPICE_ALIGN((size_t)end, 4)") - with writer.if_block("%s == 0" % is_ptr, newline=False): + with writer.if_block(is_ptr, newline=False): writer.assign("*(void **)(%s)" % dest, "(void *)end") with writer.block(" else"): writer.assign("*(SPICE_ADDRESS *)(%s)" % dest, "(SPICE_ADDRESS)end") |