[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2671-gd954a49
Jeremy Allison
jra at samba.org
Fri Feb 29 13:51:27 GMT 2008
The branch, v3-2-test has been updated
via d954a4954ba8ed6cb2c6074176a6008cfa398dd7 (commit)
from ee4810099c2d26a0ebab3c41a95bc6b57921683d (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit d954a4954ba8ed6cb2c6074176a6008cfa398dd7
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 29 05:51:09 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 f9cbcf4..6570fd4 100644
--- a/source/nmbd/nmbd_namelistdb.c
+++ b/source/nmbd/nmbd_namelistdb.c
@@ -297,7 +297,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 edcf258..98f129a 100644
--- a/source/nmbd/nmbd_nameregister.c
+++ b/source/nmbd/nmbd_nameregister.c
@@ -152,10 +152,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. */
@@ -280,10 +281,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
More information about the samba-cvs
mailing list