mirror of
https://github.com/samba-team/samba.git
synced 2025-08-03 04:22:09 +03:00
Fix part of bug #3617 from valgrind trace.
"Invalid read of size 1" errors.
Jeremy.
(This used to be commit d954a4954b
)
This commit is contained in:
@ -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;
|
||||
|
@ -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. */
|
||||
|
Reference in New Issue
Block a user