diff options
| author | Vitaliy Gusev <gusev.vitaliy@nexenta.com> | 2012-08-28 20:12:52 -0500 |
|---|---|---|
| committer | Vitaliy Gusev <gusev.vitaliy@nexenta.com> | 2012-08-28 20:12:52 -0500 |
| commit | 4c273cfa4ad8398f4157cd1d6fa54fc1cbc266ff (patch) | |
| tree | ac46094c75f0ccc480ad80f5af40ceac518e1115 /usr/src/uts/common/rpc | |
| parent | 297b4d80f1910951469165086adb179bb8dc79df (diff) | |
| download | illumos-joyent-4c273cfa4ad8398f4157cd1d6fa54fc1cbc266ff.tar.gz | |
3106 rpc: xdr_sizeof can return wrong size
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/uts/common/rpc')
| -rw-r--r-- | usr/src/uts/common/rpc/xdr_sizeof.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/uts/common/rpc/xdr_sizeof.c b/usr/src/uts/common/rpc/xdr_sizeof.c index 75917b7921..1cb1f593f4 100644 --- a/usr/src/uts/common/rpc/xdr_sizeof.c +++ b/usr/src/uts/common/rpc/xdr_sizeof.c @@ -23,8 +23,9 @@ * Copyright 2004 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ - -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. + */ #include <rpc/types.h> #include <rpc/xdr.h> @@ -136,10 +137,10 @@ xdr_sizeof(xdrproc_t func, void *data) x.x_ops = &ops; x.x_handy = 0; x.x_private = (caddr_t)NULL; + x.x_base = NULL; stat = func(&x, data); if (x.x_private) mem_free(x.x_private, (uintptr_t)x.x_base); - x.x_base = (caddr_t)0; return (stat == TRUE ? (unsigned int)x.x_handy: 0); } |