summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-12-13 09:32:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:07:22 -0500
commit3a1786650303267ec359c94c7d518cceb584fc53 (patch)
treec43976eb705908abbb9c46df31a7ee7f6f811014 /source4
parent6acf7a782cdd70e674af12ab12975b59ce29c2d7 (diff)
downloadsamba-3a1786650303267ec359c94c7d518cceb584fc53.tar.gz
samba-3a1786650303267ec359c94c7d518cceb584fc53.tar.bz2
samba-3a1786650303267ec359c94c7d518cceb584fc53.zip
r4170: don't check array size for conformant arrays (they are checked separately)
(This used to be commit e399834ae1aa9731d5d29c04d5b7b90e356dad6f)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/pidl/parser.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/build/pidl/parser.pm b/source4/build/pidl/parser.pm
index 8fb74b2e0e..d6a27ddff2 100644
--- a/source4/build/pidl/parser.pm
+++ b/source4/build/pidl/parser.pm
@@ -286,7 +286,8 @@ sub CheckArraySizes($$)
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);