svn commit: samba r5977 - in branches/SAMBA_4_0/source: librpc/ndr
torture/rpc
jelmer at samba.org
jelmer at samba.org
Tue Mar 22 23:00:12 GMT 2005
Author: jelmer
Date: 2005-03-22 23:00:12 +0000 (Tue, 22 Mar 2005)
New Revision: 5977
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5977
Log:
Fix uninitialised memory bug in ndr_pull_ref_ptr(). This fixes the
Test_DoublePointer test failure.
Modified:
branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
branches/SAMBA_4_0/source/torture/rpc/echo.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c 2005-03-22 22:11:50 UTC (rev 5976)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c 2005-03-22 23:00:12 UTC (rev 5977)
@@ -144,11 +144,10 @@
*/
NTSTATUS ndr_pull_ref_ptr(struct ndr_pull *ndr, uint32_t *v)
{
- NTSTATUS status;
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, v));
/* ref pointers always point to data */
*v = 1;
- return status;
+ return NT_STATUS_OK;
}
/*
Modified: branches/SAMBA_4_0/source/torture/rpc/echo.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/echo.c 2005-03-22 22:11:50 UTC (rev 5976)
+++ branches/SAMBA_4_0/source/torture/rpc/echo.c 2005-03-22 23:00:12 UTC (rev 5977)
@@ -260,21 +260,21 @@
i, nt_errstr(status));
ret = False;
} else if (r[i].out.result != r[i].in.seconds) {
- printf("Failed - Sleeped for %u seconds (but we said %u seconds and the reply takes only %u seconds)\n",
+ printf("Failed - Slept for %u seconds (but we said %u seconds and the reply takes only %u seconds)\n",
r[i].out.result, r[i].in.seconds, (uint_t)diff[i].tv_sec);
ret = False;
} else {
if (r[i].out.result > diff[i].tv_sec) {
- printf("Failed - Sleeped for %u seconds (but reply takes only %u.%06u seconds)\n",
+ printf("Failed - Slept for %u seconds (but reply takes only %u.%06u seconds)\n",
r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec);
} else if (r[i].out.result+1 == diff[i].tv_sec) {
- printf("Sleeped for %u seconds (but reply takes %u.%06u seconds - busy server?)\n",
+ printf("Slept for %u seconds (but reply takes %u.%06u seconds - busy server?)\n",
r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec);
} else if (r[i].out.result == diff[i].tv_sec) {
- printf("Sleeped for %u seconds (reply takes %u.%06u seconds - ok)\n",
+ printf("Slept for %u seconds (reply takes %u.%06u seconds - ok)\n",
r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec);
} else {
- printf("(Failed) - Not async - Sleeped for %u seconds (but reply takes %u.%06u seconds)\n",
+ printf("(Failed) - Not async - Slept for %u seconds (but reply takes %u.%06u seconds)\n",
r[i].out.result, (uint_t)diff[i].tv_sec, (uint_t)diff[i].tv_usec);
/* TODO: let the test fail here, when we support async rpc on ncacn_np
ret = False;*/
@@ -375,23 +375,10 @@
}
if (value != r.out.result) {
- printf("TestSurrounding did not return original value\n");
+ printf("TestDoublePointer did not return original value (%d != %d)\n", value, r.out.result);
ret = False;
}
- pvalue = NULL;
-
- status = dcerpc_echo_TestDoublePointer(p, mem_ctx, &r);
- if (!NT_STATUS_IS_OK(status)) {
- printf("TestDoublePointer failed - %s\n", nt_errstr(status));
- ret = False;
- }
-
- if (r.out.result != 0) {
- printf("TestSurrounding did not return 0 when passed a NULL pointer\n");
- ret = False;
- }
-
return ret;
}
More information about the samba-cvs
mailing list