summaryrefslogtreecommitdiff
path: root/pbx
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2006-11-27 15:48:57 +0000
committerJoshua Colp <jcolp@digium.com>2006-11-27 15:48:57 +0000
commit4e333a782c9f3e019ccf5966cdb961af19d41ab8 (patch)
treefbf8430a8aa2124750c721ec5f72f17d4b9375eb /pbx
parent237c8be66cc429cc2c199a0772a301d132049c28 (diff)
More fixes for referencing a structure after it has been freed. (issue #8425 reported by arkadia)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
-rw-r--r--pbx/pbx_spool.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 2293ca9ab..6325f92eb 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -403,20 +403,20 @@ static int scan_service(char *fn, time_t now, time_t atime)
return now;
} else {
ast_log(LOG_EVENT, "Queued call to %s/%s expired without completion after %d attempt%s\n", o->tech, o->dest, o->retries - 1, ((o->retries - 1) != 1) ? "s" : "");
- free_outgoing(o);
remove_from_queue(o, "Expired");
+ free_outgoing(o);
return 0;
}
} else {
+ remove_from_queue(o, "Failed");
free_outgoing(o);
ast_log(LOG_WARNING, "Invalid file contents in %s, deleting\n", fn);
fclose(f);
- remove_from_queue(o, "Failed");
}
} else {
+ remove_from_queue(o, "Failed");
free_outgoing(o);
ast_log(LOG_WARNING, "Unable to open %s: %s, deleting\n", fn, strerror(errno));
- remove_from_queue(o, "Failed");
}
} else
ast_log(LOG_WARNING, "Out of memory :(\n");