diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2021-05-28 12:18:48 +1200 |
|---|---|---|
| committer | Douglas Bagnall <dbagnall@samba.org> | 2021-06-02 03:56:36 +0000 |
| commit | c35f4180a44eb3caecad0f2daab46574bc52be83 (patch) | |
| tree | f15c31a48bb38c5aa23be3a608e3d3f004bc6a2f /pidl | |
| parent | 0cc4478070b9c980d653adf31647dd541cf4be22 (diff) | |
| download | samba-c35f4180a44eb3caecad0f2daab46574bc52be83.tar.gz | |
libndr: Return error code from ndr_token_peek()
This makes it safer to change our code to remove tokens after use
if failing to obtain a token would result in an error.
This means changing ndr_get_array_size() and ndr_get_array_length()
to also return an error code.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14710
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'pidl')
| -rw-r--r-- | pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 119590f6696..011fd3fa0c4 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -340,20 +340,21 @@ sub ParseArrayPullGetSize($$$$$$) my $size; + my $array_size = "size_$e->{NAME}_$l->{LEVEL_INDEX}"; + if ($l->{IS_CONFORMANT}) { - $size = "ndr_get_array_size($ndr, " . get_pointer_to($var_name) . ")"; + $self->pidl("NDR_CHECK(ndr_get_array_size($ndr, (void*)" . get_pointer_to($var_name) . ", &$array_size));"); } elsif ($l->{IS_ZERO_TERMINATED} and $l->{SIZE_IS} == 0 and $l->{LENGTH_IS} == 0) { # Noheader arrays $size = "ndr_get_string_size($ndr, sizeof(*$var_name))"; + $self->pidl("$array_size = $size;"); } else { $size = ParseExprExt($l->{SIZE_IS}, $env, $e->{ORIGINAL}, check_null_pointer($e, $env, sub { $self->pidl(shift); }, "return ndr_pull_error($ndr, NDR_ERR_INVALID_POINTER, \"NULL Pointer for size_is()\");"), check_fully_dereferenced($e, $env)); + $self->pidl("$array_size = $size;"); } - $self->pidl("size_$e->{NAME}_$l->{LEVEL_INDEX} = $size;"); - my $array_size = "size_$e->{NAME}_$l->{LEVEL_INDEX}"; - if (my $range = has_property($e, "range")) { my ($low, $high) = parse_range($range); if ($low < 0) { @@ -385,10 +386,10 @@ sub ParseArrayPullGetLength($$$$$$;$) return $array_size; } - my $length = "ndr_get_array_length($ndr, " . get_pointer_to($var_name) .")"; - $self->pidl("length_$e->{NAME}_$l->{LEVEL_INDEX} = $length;"); my $array_length = "length_$e->{NAME}_$l->{LEVEL_INDEX}"; + $self->pidl("NDR_CHECK(ndr_get_array_length($ndr, (void*)" . get_pointer_to($var_name) . ", &$array_length));"); + if (my $range = has_property($e, "range")) { my ($low, $high) = parse_range($range); if ($low < 0) { |