pidl:Samba4/NDR/Parser: fix NDR64 union alignment
authorStefan Metzmacher <metze@samba.org>
Mon, 16 Aug 2010 15:35:50 +0000 (17:35 +0200)
committerStefan Metzmacher <metze@samba.org>
Sun, 24 Oct 2010 17:49:23 +0000 (17:49 +0000)
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

pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm

index 27e7a30..09518f7 100644 (file)
@@ -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) {");