[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2676-ge740682

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  e7406822d32d5b36d3706144efbd1eaa7c44cead (commit)
       via  fa12667ec284fdda45b79cbf6bf548ab0faae34f (commit)
      from  f673bbd300d972dd7ae2d092b3b1e642ed29cfd2 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit e7406822d32d5b36d3706144efbd1eaa7c44cead
Merge: fa12667ec284fdda45b79cbf6bf548ab0faae34f f673bbd300d972dd7ae2d092b3b1e642ed29cfd2
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 29 06:56:06 2008 -0800

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit fa12667ec284fdda45b79cbf6bf548ab0faae34f
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 29 06:55:33 2008 -0800

    Patch to fix the "Invalid read of size 4" errors. Bug #3617.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/nmbd/nmbd_responserecordsdb.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nmbd/nmbd_responserecordsdb.c b/source/nmbd/nmbd_responserecordsdb.c
index 6498ce0..b042fb4 100644
--- a/source/nmbd/nmbd_responserecordsdb.c
+++ b/source/nmbd/nmbd_responserecordsdb.c
@@ -46,6 +46,24 @@ static void add_response_record(struct subnet_record *subrec,
 void remove_response_record(struct subnet_record *subrec,
 				struct response_record *rrec)
 {
+	/* It is possible this can be called twice,
+	   with a rrec pointer that has been freed. So
+	   before we inderect into rrec, search for it
+	   on the responselist first. Bug #3617. JRA. */
+
+	struct response_record *p = NULL;
+
+	for (p = subrec->responselist; p; p = p->next) {
+		if (p == rrec) {
+			break;
+		}
+	}
+
+	if (p == NULL) {
+		/* We didn't find rrec on the list. */
+		return;
+	}
+
 	DLIST_REMOVE(subrec->responselist, rrec);
 
 	if(rrec->userdata) {


-- 
Samba Shared Repository