# HG changeset patch
# User Vitaliy Gusev <gusev.vitaliy@nexenta.com>
# Date 1346202772 18000
# Node ID 271108bf13d7855edbf5da14ac1da7872ebdd8ca
# Parent  7f50f76414affe8c4abb8f7e5ead81651f405078
3106 rpc: xdr_sizeof can return wrong size
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

diff -r 7f50f76414af -r 271108bf13d7 usr/src/uts/common/rpc/xdr_sizeof.c
--- a/usr/src/uts/common/rpc/xdr_sizeof.c	Tue Aug 28 19:48:04 2012 -0500
+++ b/usr/src/uts/common/rpc/xdr_sizeof.c	Tue Aug 28 20:12:52 2012 -0500
@@ -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 @@
 	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);
 }