r7789: fix overparanoid assert() call when checking spolss buffer pointers
authorGerald Carter <jerry@samba.org>
Mon, 20 Jun 2005 22:13:19 +0000 (22:13 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 15:57:21 +0000 (10:57 -0500)
source/rpc_parse/parse_buffer.c

index a48d5cfa982b3a6718daa96341ea7d582013ea8a..ff2a7cc2f6e456e5c6cc038f89a4b2cbb805bb59 100644 (file)
@@ -173,14 +173,20 @@ BOOL rpcbuf_alloc_size(RPC_BUFFER *buffer, uint32 buffer_size)
 
 void rpcbuf_move(RPC_BUFFER *src, RPC_BUFFER **dest)
 {
-       SMB_ASSERT( src != NULL );
+       if ( !src ) {
+               *dest = NULL;
+               return;
+       }
+
+       prs_switch_type( &src->prs, MARSHALL );
 
-       prs_switch_type(&src->prs, MARSHALL);
-       if(!prs_set_offset(&src->prs, 0))
+       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;
 }
 
 /*******************************************************************