From 36fb8185edc70dfdedbf6e26c2aafaa3c46a9102 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 17 Aug 2005 12:28:47 +0000
Subject: r9356: a better way of coping with NULL arrays in the array bounds
 checking. This copes with the case of size_is(*size) where size is NULL, and
 the array is NULL (This used to be commit
 56769b4b1d900cce60cd35298b642a85e4eddfee)

---
 source4/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/build')

diff --git a/source4/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm b/source4/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
index 65b9ed57bc..4dd838bcb7 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
+++ b/source4/build/pidl/Parse/Pidl/Samba/NDR/Parser.pm
@@ -319,14 +319,18 @@ sub ParseArrayPullHeader($$$$$)
 
 	if ($l->{IS_CONFORMANT} and not $l->{IS_ZERO_TERMINATED}) {
 		my $size = ParseExpr($l->{SIZE_IS}, $env);
+		defer "if ($var_name) {";
 		check_null_pointer_deferred($size);
 		defer "NDR_CHECK(ndr_check_array_size(ndr, (void*)" . get_pointer_to($var_name) . ", $size));";
+		defer "}";
 	}
 
 	if ($l->{IS_VARYING} and not $l->{IS_ZERO_TERMINATED}) {
 		my $length = ParseExpr($l->{LENGTH_IS}, $env);
+		defer "if ($var_name) {";
 		check_null_pointer_deferred($length);
 		defer "NDR_CHECK(ndr_check_array_length(ndr, (void*)" . get_pointer_to($var_name) . ", $length));";
+		defer "}"
 	}
 
 	if (!$l->{IS_FIXED}) {
-- 
cgit