summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2010-04-16 11:04:27 +0200
committerKarolin Seeger <kseeger@samba.org>2010-06-18 08:33:27 +0200
commitecd91e5fae95bef8be26418238be1b0f01d0e431 (patch)
tree6c91db3d257bd14874ea721e648dd08eeb0832af
parent7ca739f14880d3e892b438b761aa6815063f4333 (diff)
downloadsamba-ecd91e5fae95bef8be26418238be1b0f01d0e431.tar.gz
s3-winreg_nt: Fixed QueryValue with data=NULL to get the length. (cherry picked from commit 4567bf9df53e62c0f30279235d56d13cb38de190)
(cherry picked from commit b541fb1500aad87aee46ef48036f3b4a05b119cd)
-rw-r--r--source3/rpc_server/srv_winreg_nt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c
index 840acba58f9..04c9c8ccfa7 100644
--- a/source3/rpc_server/srv_winreg_nt.c
+++ b/source3/rpc_server/srv_winreg_nt.c
@@ -320,7 +320,9 @@ WERROR _winreg_QueryValue(pipes_struct *p, struct winreg_QueryValue *r)
} else {
*r->out.data_length = outbuf_size;
*r->out.data_size = outbuf_size;
- memcpy(r->out.data, outbuf, outbuf_size);
+ if (r->out.data) {
+ memcpy(r->out.data, outbuf, outbuf_size);
+ }
status = WERR_OK;
}