summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-12-02 11:33:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:00 -0500
commitf4edfc21e5be94ef982caea1891b2305d7dfba85 (patch)
treee07accda7078e56ef3ae6bde065f3b935aa3b0f9
parent150848248a8b97c58a6f09c83a8784e61f858170 (diff)
downloadsamba-f4edfc21e5be94ef982caea1891b2305d7dfba85.tar.gz
samba-f4edfc21e5be94ef982caea1891b2305d7dfba85.tar.bz2
samba-f4edfc21e5be94ef982caea1891b2305d7dfba85.zip
r12016: fixed a valgrind error
(This used to be commit 482548031e69ba4bddac999ca9f2cb6ad8359953)
-rw-r--r--source4/librpc/ndr/ndr_basic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c
index f22e7989bf..615119fad3 100644
--- a/source4/librpc/ndr/ndr_basic.c
+++ b/source4/librpc/ndr/ndr_basic.c
@@ -132,7 +132,7 @@ NTSTATUS ndr_pull_generic_ptr(struct ndr_pull *ndr, uint32_t *v)
{
NTSTATUS status;
status = ndr_pull_uint32(ndr, NDR_SCALARS, v);
- if (*v != 0) {
+ if (NT_STATUS_IS_OK(status) && *v != 0) {
ndr->ptr_count++;
}
return status;