varname scope un-masking and fix a check

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6845 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
2007-12-17 23:19:10 +00:00
parent 577afaf6f6
commit 304d5004a6
2 changed files with 10 additions and 11 deletions

View File

@@ -1063,7 +1063,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_destroy(switch_ivr_digit
{
switch_status_t status = SWITCH_STATUS_FALSE;
if (stream == NULL && stream->digits != NULL) {
if (stream && stream->digits != NULL) {
free(stream->digits);
stream->digits = NULL;
status = SWITCH_STATUS_SUCCESS;
@@ -1379,8 +1379,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_generate_xml_cdr(switch_core_session_
switch_caller_profile_t *cp = NULL;
int i_off = 0;
for (cp = caller_profile->caller_extension->children; cp; cp = cp->next) {
switch_caller_application_t *ap;
int app_off = 0;
app_off = 0;
if (!cp->caller_extension) {
continue;