summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-24 18:18:20 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:04:19 -0500
commitddbd7bed65fbe404c171c58aef6f2f28c05f186d (patch)
treecaf05b9b4a0f2072fadc7d433e24f273936a7fcc /source4
parent306baa12f803d06f86efd62438b9f996da2eff07 (diff)
downloadsamba-ddbd7bed65fbe404c171c58aef6f2f28c05f186d.tar.gz
samba-ddbd7bed65fbe404c171c58aef6f2f28c05f186d.tar.bz2
samba-ddbd7bed65fbe404c171c58aef6f2f28c05f186d.zip
r15220: Another attempt to fix the bug found by the IBM Checker
(This used to be commit 9f79bfc05d456c106cca44ee459eb542273c3a0c)
Diffstat (limited to 'source4')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
index 91938c038e..550499a5f3 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
@@ -154,7 +154,11 @@ sub EjsPullPointer($$$$$)
my ($e, $l, $var, $name, $env) = @_;
pidl "if (ejs_pull_null(ejs, v, $name)) {";
indent;
- pidl "$var = NULL;";
+ if ($l->{POINTER_TYPE} eq "ref") {
+ pidl "return NT_STATUS_INVALID_PARAMETER_MIX;";
+ } else {
+ pidl "$var = NULL;";
+ }
deindent;
pidl "} else {";
indent;