kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 09:58:17 +00:00
Code Issues Projects Releases Wiki Activity

xml_config: Fix issue where default NULL strings were ignored on reload

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13052 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Mathieu Rene
2009-04-16 02:26:32 +00:00
parent de0696d414
commit 98a7172281
3 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/switch_xml_config.c
View File

@@ -232,27 +232,49 @@ SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *ev
newstring = (char*)item->defaultvalue;
}
if (newstring) {
if (string_options->length > 0) {
/* We have a preallocated buffer */
char *dest = (char*)item->ptr;
if (string_options->length > 0) {
/* We have a preallocated buffer */
char *dest = (char*)item->ptr;
if (newstring) {
if (strncasecmp(dest, newstring, string_options->length)) {
switch_copy_string(dest, newstring, string_options->length);
changed = SWITCH_TRUE;
}
} else {
char **dest = (char**)item->ptr;
if (*dest != '\0') {
*dest = '\0';
changed = SWITCH_TRUE;
}
}
} else if (string_options->pool) {
/* Pool-allocated buffer */
char **dest = (char**)item->ptr;
if (!*dest || strcasecmp(*dest, newstring)) {
if (string_options->pool) {
*dest = switch_core_strdup(string_options->pool, newstring);
} else {
switch_safe_free(*dest);
*dest = strdup(newstring);
}
changed = SWITCH_TRUE;
if (newstring) {
if (!*dest || strcmp(*dest, newstring)) {
*dest = switch_core_strdup(string_options->pool, newstring);
}
} else {
if (*dest) {
changed = SWITCH_TRUE;
*dest = NULL;
}
}
} else {
/* Dynamically allocated buffer */
char **dest = (char**)item->ptr;
if (newstring) {
if (!*dest || strcmp(*dest, newstring)) {
switch_safe_free(*dest);
*dest = strdup(newstring);
changed = SWITCH_TRUE;
}
} else {
if (*dest) {
switch_safe_free(*dest);
changed = SWITCH_TRUE;
}
}
}