sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

r20638: Check for NULL pointers (where possible) in print functions. Fixes #4218,

Browse Source 
but without reintroducing coverity warnings.
(This used to be commit a0e2e30d57)
This commit is contained in:
Jelmer Vernooij 2007-01-10 00:37:30 +00:00 committed by Gerald (Jerry) Carter
parent 95f7f4d001
commit 348b7bc380
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
View File

@ -304,9 +304,9 @@ sub ParseArrayPushHeader($$$$$)
return $length; return $length;
} }
sub check_null_pointer($$$) sub check_null_pointer($$$$)
{ {
my ($element, $env, $print_fn) = @_; my ($element, $env, $print_fn, $return) = @_;
return sub ($) { return sub ($) {
my $expandedvar = shift; my $expandedvar = shift;
@ -355,7 +355,7 @@ sub check_null_pointer($$$)
$check = 1; $check = 1;
} }
$print_fn->("if ($ptr$expandedvar == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;") if $check; $print_fn->("if ($ptr$expandedvar == NULL) $return") if $check;
} }
} }
@ -374,7 +374,7 @@ sub ParseArrayPullHeader($$$$$)
$length = $size = "ndr_get_string_size($ndr, sizeof(*$var_name))"; $length = $size = "ndr_get_string_size($ndr, sizeof(*$var_name))";
} else { } else {
$length = $size = ParseExprExt($l->{SIZE_IS}, $env, $e, $length = $size = ParseExprExt($l->{SIZE_IS}, $env, $e,
check_null_pointer($e, $env, \&pidl)); check_null_pointer($e, $env, \&pidl, "return NT_STATUS_INVALID_PARAMETER_MIX;"));
} }
if ((!$l->{IS_SURROUNDING}) and $l->{IS_CONFORMANT}) { if ((!$l->{IS_SURROUNDING}) and $l->{IS_CONFORMANT}) {
@ -397,7 +397,7 @@ sub ParseArrayPullHeader($$$$$)
if ($l->{IS_CONFORMANT} and not $l->{IS_ZERO_TERMINATED}) { if ($l->{IS_CONFORMANT} and not $l->{IS_ZERO_TERMINATED}) {
defer "if ($var_name) {"; defer "if ($var_name) {";
defer_indent; defer_indent;
my $size = ParseExprExt($l->{SIZE_IS}, $env, $e, check_null_pointer($e, $env, \&defer)); my $size = ParseExprExt($l->{SIZE_IS}, $env, $e, check_null_pointer($e, $env, \&defer, "return NT_STATUS_INVALID_PARAMETER_MIX;"));
defer "NDR_CHECK(ndr_check_array_size(ndr, (void*)" . get_pointer_to($var_name) . ", $size));"; defer "NDR_CHECK(ndr_check_array_size(ndr, (void*)" . get_pointer_to($var_name) . ", $size));";
defer_deindent; defer_deindent;
defer "}"; defer "}";
@ -406,7 +406,7 @@ sub ParseArrayPullHeader($$$$$)
if ($l->{IS_VARYING} and not $l->{IS_ZERO_TERMINATED}) { if ($l->{IS_VARYING} and not $l->{IS_ZERO_TERMINATED}) {
defer "if ($var_name) {"; defer "if ($var_name) {";
defer_indent; defer_indent;
my $length = ParseExprExt($l->{LENGTH_IS}, $env, $e, check_null_pointer($e, $env, \&defer)); my $length = ParseExprExt($l->{LENGTH_IS}, $env, $e, check_null_pointer($e, $env, \&defer, "return NT_STATUS_INVALID_PARAMETER_MIX;"));
defer "NDR_CHECK(ndr_check_array_length(ndr, (void*)" . get_pointer_to($var_name) . ", $length));"; defer "NDR_CHECK(ndr_check_array_length(ndr, (void*)" . get_pointer_to($var_name) . ", $length));";
defer_deindent; defer_deindent;
defer "}" defer "}"
@ -421,18 +421,16 @@ sub ParseArrayPullHeader($$$$$)
sub compression_alg($$) sub compression_alg($$)
{ {
my ($e,$l) = @_; my ($e, $l) = @_;
my $compression = $l->{COMPRESSION}; my ($alg, $clen, $dlen) = split(/ /, $l->{COMPRESSION});
my ($alg, $clen, $dlen) = split(/ /, $compression);
return $alg; return $alg;
} }
sub compression_clen($$$) sub compression_clen($$$)
{ {
my ($e,$l,$env) = @_; my ($e, $l, $env) = @_;
my $compression = $l->{COMPRESSION}; my ($alg, $clen, $dlen) = split(/ /, $l->{COMPRESSION});
my ($alg, $clen, $dlen) = split(/ /, $compression);
return ParseExpr($clen, $env, $e); return ParseExpr($clen, $env, $e);
} }
@ -440,8 +438,7 @@ sub compression_clen($$$)
sub compression_dlen($$$) sub compression_dlen($$$)
{ {
my ($e,$l,$env) = @_; my ($e,$l,$env) = @_;
my $compression = $l->{COMPRESSION}; my ($alg, $clen, $dlen) = split(/ /, $l->{COMPRESSION});
my ($alg, $clen, $dlen) = split(/ /, $compression);
return ParseExpr($dlen, $env, $e); return ParseExpr($dlen, $env, $e);
} }
@ -504,7 +501,7 @@ sub ParseSubcontextPushStart($$$$)
{ {
my ($e,$l,$ndr,$env) = @_; my ($e,$l,$ndr,$env) = @_;
my $subndr = "_ndr_$e->{NAME}"; my $subndr = "_ndr_$e->{NAME}";
my $subcontext_size = ParseExpr($l->{SUBCONTEXT_SIZE},$env, $e); my $subcontext_size = ParseExpr($l->{SUBCONTEXT_SIZE}, $env, $e);
pidl "{"; pidl "{";
indent; indent;
@ -522,7 +519,7 @@ sub ParseSubcontextPushEnd($$$$)
{ {
my ($e,$l,$ndr,$env) = @_; my ($e,$l,$ndr,$env) = @_;
my $subndr = "_ndr_$e->{NAME}"; my $subndr = "_ndr_$e->{NAME}";
my $subcontext_size = ParseExpr($l->{SUBCONTEXT_SIZE},$env, $e); my $subcontext_size = ParseExpr($l->{SUBCONTEXT_SIZE}, $env, $e);
if (defined $l->{COMPRESSION}) { if (defined $l->{COMPRESSION}) {
ParseCompressionPushEnd($e, $l, $subndr, $env); ParseCompressionPushEnd($e, $l, $subndr, $env);
@ -537,7 +534,7 @@ sub ParseSubcontextPullStart($$$$)
{ {
my ($e,$l,$ndr,$env) = @_; my ($e,$l,$ndr,$env) = @_;
my $subndr = "_ndr_$e->{NAME}"; my $subndr = "_ndr_$e->{NAME}";
my $subcontext_size = ParseExpr($l->{SUBCONTEXT_SIZE},$env, $e); my $subcontext_size = ParseExpr($l->{SUBCONTEXT_SIZE}, $env, $e);
pidl "{"; pidl "{";
indent; indent;
@ -555,7 +552,7 @@ sub ParseSubcontextPullEnd($$$$)
{ {
my ($e,$l,$ndr,$env) = @_; my ($e,$l,$ndr,$env) = @_;
my $subndr = "_ndr_$e->{NAME}"; my $subndr = "_ndr_$e->{NAME}";
my $subcontext_size = ParseExpr($l->{SUBCONTEXT_SIZE},$env, $e); my $subcontext_size = ParseExpr($l->{SUBCONTEXT_SIZE}, $env, $e);
if (defined $l->{COMPRESSION}) { if (defined $l->{COMPRESSION}) {
ParseCompressionPullEnd($e, $l, $subndr, $env); ParseCompressionPullEnd($e, $l, $subndr, $env);
@ -710,7 +707,7 @@ sub ParsePtrPush($$$)
# print scalars in a structure element # print scalars in a structure element
sub ParseElementPrint($$$) sub ParseElementPrint($$$)
{ {
my($e,$var_name,$env) = @_; my($e, $var_name, $env) = @_;
return if (has_property($e, "noprint")); return if (has_property($e, "noprint"));
@ -744,7 +741,8 @@ sub ParseElementPrint($$$)
if ($l->{IS_ZERO_TERMINATED}) { if ($l->{IS_ZERO_TERMINATED}) {
$length = "ndr_string_length($var_name, sizeof(*$var_name))"; $length = "ndr_string_length($var_name, sizeof(*$var_name))";
} else { } else {
$length = ParseExpr($l->{LENGTH_IS}, $env, $e); $length = ParseExprExt($l->{LENGTH_IS}, $env, $e,
check_null_pointer($e, $env, \&pidl, "return;"));
} }
if (is_charset_array($e,$l)) { if (is_charset_array($e,$l)) {
@ -774,7 +772,8 @@ sub ParseElementPrint($$$)
} }
pidl "ndr_print_$l->{DATA_TYPE}(ndr, \"$e->{NAME}\", $var_name);"; pidl "ndr_print_$l->{DATA_TYPE}(ndr, \"$e->{NAME}\", $var_name);";
} elsif ($l->{TYPE} eq "SWITCH") { } elsif ($l->{TYPE} eq "SWITCH") {
my $switch_var = ParseExpr($l->{SWITCH_IS}, $env, $e); my $switch_var = ParseExprExt($l->{SWITCH_IS}, $env, $e,
check_null_pointer($e, $env, \&pidl, "return;"));
pidl "ndr_print_set_switch_value(ndr, " . get_pointer_to($var_name) . ", $switch_var);"; pidl "ndr_print_set_switch_value(ndr, " . get_pointer_to($var_name) . ", $switch_var);";
} }
} }
@ -804,7 +803,8 @@ sub ParseElementPrint($$$)
sub ParseSwitchPull($$$$$$) sub ParseSwitchPull($$$$$$)
{ {
my($e,$l,$ndr,$var_name,$ndr_flags,$env) = @_; my($e,$l,$ndr,$var_name,$ndr_flags,$env) = @_;
my $switch_var = ParseExprExt($l->{SWITCH_IS}, $env, $e, check_null_pointer($e, $env, \&pidl)); my $switch_var = ParseExprExt($l->{SWITCH_IS}, $env, $e,
check_null_pointer($e, $env, \&pidl, "return NT_STATUS_INVALID_PARAMETER_MIX;"));
$var_name = get_pointer_to($var_name); $var_name = get_pointer_to($var_name);
pidl "NDR_CHECK(ndr_pull_set_switch_value($ndr, $var_name, $switch_var));"; pidl "NDR_CHECK(ndr_pull_set_switch_value($ndr, $var_name, $switch_var));";
@ -815,7 +815,8 @@ sub ParseSwitchPull($$$$$$)
sub ParseSwitchPush($$$$$$) sub ParseSwitchPush($$$$$$)
{ {
my($e,$l,$ndr,$var_name,$ndr_flags,$env) = @_; my($e,$l,$ndr,$var_name,$ndr_flags,$env) = @_;
my $switch_var = ParseExprExt($l->{SWITCH_IS}, $env, $e, check_null_pointer($e, $env, \&pidl)); my $switch_var = ParseExprExt($l->{SWITCH_IS}, $env, $e,
check_null_pointer($e, $env, \&pidl, "return NT_STATUS_INVALID_PARAMETER_MIX;"));
$var_name = get_pointer_to($var_name); $var_name = get_pointer_to($var_name);
pidl "NDR_CHECK(ndr_push_set_switch_value($ndr, $var_name, $switch_var));"; pidl "NDR_CHECK(ndr_push_set_switch_value($ndr, $var_name, $switch_var));";
@ -1000,7 +1001,7 @@ sub ParseElementPullLevel
ParseMemCtxPullStart($e,$l, $var_name); ParseMemCtxPullStart($e,$l, $var_name);
$var_name = get_value_of($var_name); $var_name = get_value_of($var_name);
ParseElementPullLevel($e,GetNextLevel($e,$l), $ndr, $var_name, $env, 1, 1); ParseElementPullLevel($e, GetNextLevel($e,$l), $ndr, $var_name, $env, 1, 1);
ParseMemCtxPullEnd($e,$l); ParseMemCtxPullEnd($e,$l);
@ -2119,7 +2120,7 @@ sub ParseFunctionPull($)
and $e->{LEVELS}[1]->{IS_ZERO_TERMINATED}); and $e->{LEVELS}[1]->{IS_ZERO_TERMINATED});
if ($e->{LEVELS}[1]->{TYPE} eq "ARRAY") { if ($e->{LEVELS}[1]->{TYPE} eq "ARRAY") {
my $size = ParseExprExt($e->{LEVELS}[1]->{SIZE_IS}, $env, $e, check_null_pointer($e, $env, \&pidl)); my $size = ParseExprExt($e->{LEVELS}[1]->{SIZE_IS}, $env, $e, check_null_pointer($e, $env, \&pidl, "return NT_STATUS_INVALID_PARAMETER_MIX;"));
pidl "NDR_PULL_ALLOC_N(ndr, r->out.$e->{NAME}, $size);"; pidl "NDR_PULL_ALLOC_N(ndr, r->out.$e->{NAME}, $size);";

16
source4/pidl/tests/samba-ndr.pl
View File

@ -31,12 +31,12 @@ my $fn = check_null_pointer({
}, },
] ]
} }
}, { bla => "r->in.bla" }, \&print_fn); }, { bla => "r->in.bla" }, \&print_fn, "return;");
test_warnings("", sub { $fn->("r->in.bla"); }); test_warnings("", sub { $fn->("r->in.bla"); });
is($output, "if (r->in.bla == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;"); is($output, "if (r->in.bla == NULL) return;");
# Test case 2: Simple ref pointer dereference # Test case 2: Simple ref pointer dereference
@ -55,7 +55,7 @@ $fn = check_null_pointer({
}, },
] ]
} }
}, { bla => "r->in.bla" }, \&print_fn); }, { bla => "r->in.bla" }, \&print_fn, undef);
test_warnings("", sub { $fn->("r->in.bla"); }); test_warnings("", sub { $fn->("r->in.bla"); });
@ -77,7 +77,7 @@ $fn = check_null_pointer({
}, },
] ]
} }
}, { bla => "r->in.bla" }, \&print_fn); }, { bla => "r->in.bla" }, \&print_fn, undef);
test_warnings("nofile:1: too much dereferences for `bla'\n", test_warnings("nofile:1: too much dereferences for `bla'\n",
sub { $fn->("r->in.bla"); }); sub { $fn->("r->in.bla"); });
@ -104,12 +104,12 @@ $fn = check_null_pointer({
}, },
] ]
} }
}, { bla => "r->in.bla" }, \&print_fn); }, { bla => "r->in.bla" }, \&print_fn, "return;");
test_warnings("", test_warnings("",
sub { $fn->("*r->in.bla"); }); sub { $fn->("*r->in.bla"); });
is($output, "if (*r->in.bla == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;"); is($output, "if (*r->in.bla == NULL) return;");
# Test case 5: Unknown variable # Test case 5: Unknown variable
@ -127,9 +127,9 @@ $fn = check_null_pointer({
}, },
] ]
} }
}, { }, \&print_fn); }, { }, \&print_fn, "return;");
test_warnings("nofile:2: unknown dereferenced expression `r->in.bla'\n", test_warnings("nofile:2: unknown dereferenced expression `r->in.bla'\n",
sub { $fn->("r->in.bla"); }); sub { $fn->("r->in.bla"); });
is($output, "if (r->in.bla == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;"); is($output, "if (r->in.bla == NULL) return;");