diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-08-16 17:35:50 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-10-24 17:49:23 +0000 |
| commit | 482c02284068810a57b35a509857fb1273d833b0 (patch) | |
| tree | 4f716be751bf5c896f3ee568c7d8506fe59b92cd | |
| parent | fd628e7ae4653d5224c5dfcd9b2815113eaae7b8 (diff) | |
| download | samba-482c02284068810a57b35a509857fb1273d833b0.tar.gz samba-482c02284068810a57b35a509857fb1273d833b0.tar.bz2 samba-482c02284068810a57b35a509857fb1273d833b0.zip | |
pidl:Samba4/NDR/Parser: fix NDR64 union alignment
We need to align before the switch_type and before the
union arms. Both alignments are to the boundary of the largest
possible union arm.
This means that adding a new union arm with a larger alignment
would break compat!!!
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sun Oct 24 17:49:23 UTC 2010 on sn-devel-104
| -rw-r--r-- | pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 27e7a30ca6..09518f7cee 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -1688,6 +1688,10 @@ sub ParseUnionPushPrimitives($$$$) $self->pidl("uint32_t level = ndr_push_get_switch_value($ndr, $varname);"); + if (defined($e->{ALIGN})) { + $self->pidl("NDR_CHECK(ndr_push_union_align($ndr, $e->{ALIGN}));"); + } + if (defined($e->{SWITCH_TYPE})) { $self->pidl("NDR_CHECK(ndr_push_$e->{SWITCH_TYPE}($ndr, NDR_SCALARS, level));"); } @@ -1833,6 +1837,10 @@ sub ParseUnionPullPrimitives($$$$$) my ($self,$e,$ndr,$varname,$switch_type) = @_; my $have_default = 0; + if (defined($e->{ALIGN})) { + $self->pidl("NDR_CHECK(ndr_pull_union_align($ndr, $e->{ALIGN}));"); + } + if (defined($switch_type)) { $self->pidl("NDR_CHECK(ndr_pull_$switch_type($ndr, NDR_SCALARS, &_level));"); $self->pidl("if (_level != level) {"); |