From c46ed8dd8daf3cfd7223b4bba14383740a8e328b Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 2 Sep 2015 11:52:39 -0400 Subject: [PATCH] MT#14777 coredump fix when running out of ports (cherry picked from commit 5241481d4f155c3487a06f3b8a399364d5c59020) --- daemon/call.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/daemon/call.c b/daemon/call.c index 912919197..586236a6b 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -2276,7 +2276,11 @@ done: int call_stream_address(char *o, struct packet_stream *ps, enum stream_address_format format, int *len) { csa_func f; + o[0] = 0; + *len = 0; ps = packet_stream_sink(ps); + if (!ps) + return -1; f = __call_stream_address(ps, 0); return f(o, ps, format, len); } @@ -2284,7 +2288,11 @@ int call_stream_address(char *o, struct packet_stream *ps, enum stream_address_f int call_stream_address_alt(char *o, struct packet_stream *ps, enum stream_address_format format, int *len) { csa_func f; + o[0] = 0; + *len = 0; ps = packet_stream_sink(ps); + if (!ps) + return -1; f = __call_stream_address(ps, 1); return f ? f(o, ps, format, len) : -1; }