[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-141-g20971d8

[Jeremy Allison]

The branch, v3-0-test has been updated
       via  20971d829d7ae2c1b31ebc872da787f3467fa6b0 (commit)
      from  91703434550c8d539258f4eac45edbc4d0b9f2b9 (commit)

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


- Log -----------------------------------------------------------------
commit 20971d829d7ae2c1b31ebc872da787f3467fa6b0
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Feb 29 05:56:32 2008 -0800

     Fix part of bug #3617 from valgrind trace.
    "Invalid read of size 1" errors.
    Jeremy.

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

Summary of changes:
 source/nmbd/nmbd_namelistdb.c   |    1 -
 source/nmbd/nmbd_nameregister.c |    6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nmbd/nmbd_namelistdb.c b/source/nmbd/nmbd_namelistdb.c
index cda1288..a4ad6cf 100644
--- a/source/nmbd/nmbd_namelistdb.c
+++ b/source/nmbd/nmbd_namelistdb.c
@@ -294,7 +294,6 @@ void standard_success_register(struct subnet_record *subrec,
  ******************************************************************/
 
 void standard_fail_register( struct subnet_record   *subrec,
-                             struct response_record *rrec,
                              struct nmb_name        *nmbname )
 {
 	struct name_record *namerec;
diff --git a/source/nmbd/nmbd_nameregister.c b/source/nmbd/nmbd_nameregister.c
index 8f2a889..541d594 100644
--- a/source/nmbd/nmbd_nameregister.c
+++ b/source/nmbd/nmbd_nameregister.c
@@ -153,10 +153,11 @@ static void register_name_response(struct subnet_record *subrec,
 		if( rrec->success_fn)
 			(*(register_name_success_function)rrec->success_fn)(subrec, rrec->userdata, answer_name, nb_flags, ttl, register_ip);
 	} else {
+		struct nmb_name qname = *question_name;
 		if( rrec->fail_fn)
 			(*(register_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name);
 		/* Remove the name. */
-		standard_fail_register( subrec, rrec, question_name);
+		standard_fail_register( subrec, &qname);
 	}
 
 	/* Ensure we don't retry. */
@@ -281,10 +282,11 @@ static void register_name_timeout_response(struct subnet_record *subrec,
 		if( rrec->success_fn)
 			(*(register_name_success_function)rrec->success_fn)(subrec, rrec->userdata, question_name, nb_flags, ttl, registered_ip);
 	} else {
+		struct nmb_name qname = *question_name;
 		if( rrec->fail_fn)
 			(*(register_name_fail_function)rrec->fail_fn)(subrec, rrec, question_name);
 		/* Remove the name. */
-		standard_fail_register( subrec, rrec, question_name);
+		standard_fail_register( subrec, &qname);
 	}
 
 	/* Ensure we don't retry. */


-- 
Samba Shared Repository