From 0d34288f0c41254441b9e4844d1afe7d3f236c76 Mon Sep 17 00:00:00 2001
From: Mathieu Rene <mrene@avgs.ca>
Date: Thu, 5 Mar 2009 21:09:46 +0000
Subject: [PATCH] oops[]
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12471 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
src/switch_xml_config.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/switch_xml_config.c b/src/switch_xml_config.c
index 7eea0924d1..466031b1be 100644
--- a/src/switch_xml_config.c
+++ b/src/switch_xml_config.c
@@ -41,7 +41,7 @@ SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const ch
if (!*event) {
switch_event_create(event, SWITCH_EVENT_REQUEST_PARAMS);
- switch_assert(event);
+ switch_assert(*event);
}
for (node = xml; node; node = node->next) {
@@ -58,7 +58,7 @@ SWITCH_DECLARE(switch_size_t) switch_event_import_xml(switch_xml_t xml, const ch
SWITCH_DECLARE(switch_status_t) switch_xml_config_parse(switch_xml_t xml, int reload, switch_xml_config_item_t *instructions)
{
- switch_event_t *event;
+ switch_event_t *event = NULL;
switch_status_t result;
int count = switch_event_import_xml(xml, "name", "value", &event);
@@ -165,14 +165,14 @@ SWITCH_DECLARE(switch_status_t) switch_xml_config_parse_event(switch_event_t *ev
/* We have a preallocated buffer */
char *dest = (char*)item->ptr;
- if (strncasecmp(dest, newstring, string_options->length)) {
+ if (!dest || strncasecmp(dest, newstring, string_options->length)) {
switch_copy_string(dest, newstring, string_options->length);
changed = SWITCH_TRUE;
}
} else {
char **dest = (char**)item->ptr;
- if (strcasecmp(*dest, newstring)) {
+ if (!*dest || strcasecmp(*dest, newstring)) {
if (string_options->pool) {
*dest = switch_core_strdup(string_options->pool, newstring);
} else {