sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

s3: ldap: Ensure the ADS_STRUCT pointer doesn't get freed on error, we don't own it here.

Browse Source 
Thanks to Isaac Boukris <iboukris@gmail.com> for finding the
issue and testing this fix.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13244

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jan 26 02:25:20 CET 2018 on sn-devel-144
This commit is contained in:
Jeremy Allison 2018-01-24 14:09:43 -08:00
parent 849169a7b6
commit e7425bd524
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/libads/ldap_utils.c
View File

@ -105,9 +105,18 @@ static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind
status = ads_connect(ads);
if (!ADS_ERR_OK(status)) {
bool orig_is_mine = ads->is_mine;
DEBUG(1,("ads_search_retry: failed to reconnect (%s)\n",
ads_errstr(status)));
/*
* We need to keep the ads pointer
* from being freed here as we don't own it and
* callers depend on it being around.
*/
ads->is_mine = false;
ads_destroy(&ads);
ads->is_mine = orig_is_mine;
SAFE_FREE(bp);
return status;
}