r9126: Fix valgrind bug Volker found in interaction with new aio buffer

flipping and oplocks.
Jeremy.
(This used to be commit a18c5ff3eada93e46da3f7cbd326b8dceb72e147)

2 files changed, 11 insertions, 5 deletions

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index de12003986..c0c9e989a9 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -757,8 +757,9 @@ static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id,
 
 	if((outbuf = NewOutBuffer(&saved_outbuf))==NULL) {
 		DEBUG(0,("oplock_break: malloc fail for output buffer.\n"));
-		set_InBuffer(saved_inbuf);
+		/* Free must be done before set.. */
 		free_InBuffer(inbuf);
+		set_InBuffer(saved_inbuf);
 		return False;
 	}
 
@@ -918,14 +919,15 @@ static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, unsigned long file_id,
 	/* Restore the chain fnum. */
 	file_chain_restore();
 
-	/* Restore the global In/Out buffers. */
-	set_InBuffer(saved_inbuf);
-	set_OutBuffer(saved_outbuf);
-
 	/* Free the buffers we've been using to recurse. */
+	/* Free must be done before set.. */
 	free_InBuffer(inbuf);
 	free_OutBuffer(outbuf);
 
+	/* Restore the global In/Out buffers. */
+	set_InBuffer(saved_inbuf);
+	set_OutBuffer(saved_outbuf);
+
 	/* We need this in case a readraw crossed on the wire. */
 	if(global_oplock_break)
 		global_oplock_break = False;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 19add7e095..1deb4da269 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1527,6 +1527,7 @@ char *get_InBuffer(void)
 void set_InBuffer(char *new_inbuf)
 {
 	InBuffer = new_inbuf;
+	current_inbuf = InBuffer;
 }
 
 char *get_OutBuffer(void)
@@ -1547,6 +1548,9 @@ void set_OutBuffer(char *new_outbuf)
 void free_InBuffer(char *inbuf)
 {
 	if (!aio_inbuffer_in_use(inbuf)) {
+		if (current_inbuf == inbuf) {
+			current_inbuf = NULL;
+		}
 		SAFE_FREE(inbuf);
 	}
 }