IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix modrdn plugin crash bug.

Browse Source 
Constant values were assigned to variables gthat would later be freed
with slapi_ch_free_string(). Make copies instead so the free doesn't
blow. Also remove useless tests, as these functions already check for
NULL on their own.

Fixes: https://fedorahosted.org/freeipa/ticket/529
This commit is contained in:
Simo Sorce
2010-11-22 15:17:44 -05:00
parent 960fc66447
commit aa70959f16
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
daemons/ipa-slapi-plugins/ipa-modrdn/ipa_modrdn.c
View File

@@ -444,7 +444,7 @@ ipamodrdn_parse_config_entry(Slapi_Entry * e, bool apply)
if (value && value[0]) { if (value && value[0]) {
entry->prefix = value; entry->prefix = value;
} else { } else {
entry->prefix = ""; entry->prefix = slapi_ch_strdup("");
} }
LOG_CONFIG("----------> %s [%s]\n", IPAMODRDN_PREFIX, entry->prefix); LOG_CONFIG("----------> %s [%s]\n", IPAMODRDN_PREFIX, entry->prefix);
@@ -452,7 +452,7 @@ ipamodrdn_parse_config_entry(Slapi_Entry * e, bool apply)
if (value && value[0]) { if (value && value[0]) {
entry->suffix = value; entry->suffix = value;
} else { } else {
entry->suffix = ""; entry->suffix = slapi_ch_strdup("");
} }
LOG_CONFIG("----------> %s [%s]\n", IPAMODRDN_SUFFIX, entry->suffix); LOG_CONFIG("----------> %s [%s]\n", IPAMODRDN_SUFFIX, entry->suffix);
@@ -556,30 +556,15 @@ ipamodrdn_free_config_entry(struct configEntry **entry)
if (e->dn) { if (e->dn) {
LOG_CONFIG("freeing config entry [%s]\n", e->dn); LOG_CONFIG("freeing config entry [%s]\n", e->dn);
slapi_ch_free_string(&e->dn);
} }
if (e->sattr) { slapi_ch_free_string(&e->dn);
slapi_ch_free_string(&e->sattr); slapi_ch_free_string(&e->sattr);
} slapi_ch_free_string(&e->tattr);
if (e->tattr) { slapi_ch_free_string(&e->prefix);
slapi_ch_free_string(&e->tattr); slapi_ch_free_string(&e->suffix);
} slapi_ch_free_string(&e->filter);
if (e->prefix) { slapi_filter_free(e->slapi_filter, 1);
slapi_ch_free_string(&e->prefix); slapi_ch_free_string(&e->scope);
}
if (e->suffix) {
slapi_ch_free_string(&e->prefix);
}
if (e->filter) {
slapi_ch_free_string(&e->filter);
}
if (e->slapi_filter) {
slapi_filter_free(e->slapi_filter, 1);
}
if (e->scope) {
slapi_ch_free_string(&e->scope);
}
slapi_ch_free((void **)entry); slapi_ch_free((void **)entry);
} }