r4170: don't check array size for conformant arrays (they are checked separately)
authorAndrew Tridgell <tridge@samba.org>
Mon, 13 Dec 2004 09:32:02 +0000 (09:32 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:07:22 +0000 (13:07 -0500)
(This used to be commit e399834ae1aa9731d5d29c04d5b7b90e356dad6f)

source4/build/pidl/parser.pm

index 8fb74b2e0ed882e7f650a7bdaa25ec6765f1f185..d6a27ddff260e77301ae5c0eeabd0ef1f544c2e9 100644 (file)
@@ -286,7 +286,8 @@ sub CheckArraySizes($$)
        my $e = shift;
        my $var_prefix = shift;
 
        my $e = shift;
        my $var_prefix = shift;
 
-       if (util::has_property($e, "size_is")) {
+       if (!defined $e->{CONFORMANT_SIZE} && 
+           util::has_property($e, "size_is")) {
                my $size = find_size_var($e, util::array_size($e), $var_prefix);
                pidl "\tif ($var_prefix$e->{NAME}) {\n";
                check_null_pointer($size);
                my $size = find_size_var($e, util::array_size($e), $var_prefix);
                pidl "\tif ($var_prefix$e->{NAME}) {\n";
                check_null_pointer($size);