svn commit: samba r7789 - branches/SAMBA_3_0/source/rpc_parse trunk/source/rpc_parse

[jerry at samba.org]

Author: jerry
Date: 2005-06-20 22:13:19 +0000 (Mon, 20 Jun 2005)
New Revision: 7789

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7789

Log:
fix overparanoid assert() call when checking spolss buffer pointers
Modified:
   branches/SAMBA_3_0/source/rpc_parse/parse_buffer.c
   trunk/source/rpc_parse/parse_buffer.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_parse/parse_buffer.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_parse/parse_buffer.c	2005-06-20 21:20:47 UTC (rev 7788)
+++ branches/SAMBA_3_0/source/rpc_parse/parse_buffer.c	2005-06-20 22:13:19 UTC (rev 7789)
@@ -173,14 +173,20 @@
 
 void rpcbuf_move(RPC_BUFFER *src, RPC_BUFFER **dest)
 {
-	SMB_ASSERT( src != NULL );
+	if ( !src ) {
+		*dest = NULL;
+		return;
+	}
 
-	prs_switch_type(&src->prs, MARSHALL);
-	if(!prs_set_offset(&src->prs, 0))
+	prs_switch_type( &src->prs, MARSHALL );
+
+	if ( !prs_set_offset(&src->prs, 0) )
 		return;
-	prs_force_dynamic(&src->prs);
-	prs_mem_clear(&src->prs);
-	*dest=src;
+
+	prs_force_dynamic( &src->prs );
+	prs_mem_clear( &src->prs );
+
+	*dest = src;
 }
 
 /*******************************************************************

Modified: trunk/source/rpc_parse/parse_buffer.c
===================================================================
--- trunk/source/rpc_parse/parse_buffer.c	2005-06-20 21:20:47 UTC (rev 7788)
+++ trunk/source/rpc_parse/parse_buffer.c	2005-06-20 22:13:19 UTC (rev 7789)
@@ -173,14 +173,20 @@
 
 void rpcbuf_move(RPC_BUFFER *src, RPC_BUFFER **dest)
 {
-	SMB_ASSERT( src != NULL );
+	if ( !src ) {
+		*dest = NULL;
+		return;
+	}
 
-	prs_switch_type(&src->prs, MARSHALL);
-	if(!prs_set_offset(&src->prs, 0))
+	prs_switch_type( &src->prs, MARSHALL );
+
+	if ( !prs_set_offset(&src->prs, 0) )
 		return;
-	prs_force_dynamic(&src->prs);
-	prs_mem_clear(&src->prs);
-	*dest=src;
+
+	prs_force_dynamic( &src->prs );
+	prs_mem_clear( &src->prs );
+
+	*dest = src;
 }
 
 /*******************************************************************