diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-01-06 00:06:49 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-01-06 00:06:49 +0000 |
| commit | 9925ab72f0274aee8c13567b22a37289474af751 (patch) | |
| tree | 163bb5ff0e46d738fdd46c68bc7a96ce051e95cb | |
| parent | e74ebcd700f5502820a08f5f61dc14ab7bab3a97 (diff) | |
| download | samba-9925ab72f0274aee8c13567b22a37289474af751.tar.gz samba-9925ab72f0274aee8c13567b22a37289474af751.tar.bz2 samba-9925ab72f0274aee8c13567b22a37289474af751.zip | |
(merge from 3.0)
There is some memory corruption hidden somewhere in our winbind code. If I
could reproduce it, I would fix it, but for now just make sure we always
SAFE_FREE() and set our starting pointers to NULL.
Andrew Bartlett
(This used to be commit a00f29624d10df7f31fa978b79bc71b40d696359)
| -rw-r--r-- | source3/libads/ldap_utils.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/libads/ldap_utils.c b/source3/libads/ldap_utils.c index 4142bceabc..991f16c845 100644 --- a/source3/libads/ldap_utils.c +++ b/source3/libads/ldap_utils.c @@ -35,6 +35,8 @@ ADS_STATUS ads_do_search_retry(ADS_STRUCT *ads, const char *bind_path, int scope int count = 3; char *bp; + *res = NULL; + if (!ads->ld && time(NULL) - ads->last_attempt < ADS_RECONNECT_TIME) { return ADS_ERROR(LDAP_SERVER_DOWN); @@ -42,15 +44,17 @@ ADS_STATUS ads_do_search_retry(ADS_STRUCT *ads, const char *bind_path, int scope bp = strdup(bind_path); - if (!bp) + if (!bp) { return ADS_ERROR_NT(NT_STATUS_NO_MEMORY); + } while (count--) { + *res = NULL; status = ads_do_search_all(ads, bp, scope, expr, attrs, res); if (ADS_ERR_OK(status)) { DEBUG(5,("Search for %s gave %d replies\n", expr, ads_count_replies(ads, *res))); - free(bp); + SAFE_FREE(bp); return status; } @@ -72,11 +76,11 @@ ADS_STATUS ads_do_search_retry(ADS_STRUCT *ads, const char *bind_path, int scope DEBUG(1,("ads_search_retry: failed to reconnect (%s)\n", ads_errstr(status))); ads_destroy(&ads); - free(bp); + SAFE_FREE(bp); return status; } } - free(bp); + SAFE_FREE(bp); if (!ADS_ERR_OK(status)) DEBUG(1,("ads reopen failed after error %s\n", |