From: Michael Jerris Date: Tue, 12 Jan 2016 18:03:01 +0000 (-0500) Subject: Revert "FS-8720: [core] allow passing in blank/null to session::hangup to mean NORMAL... X-Git-Tag: v1.6.7~2^2~154 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fc4c52392e62e926fdada24f0e4af9004428232;p=thirdparty%2Ffreeswitch.git Revert "FS-8720: [core] allow passing in blank/null to session::hangup to mean NORMAL_CLEARING hangup cause instead of segfault" wrong fix for this issue This reverts commit 3304492b411c46376d9b0d4dbe512c08390e4836. --- diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp index 25be61d7f4..0467109926 100644 --- a/src/switch_cpp.cpp +++ b/src/switch_cpp.cpp @@ -718,7 +718,7 @@ SWITCH_DECLARE(void) CoreSession::hangup(const char *cause) sanity_check_noreturn; switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CoreSession::hangup\n"); this->begin_allow_threads(); - switch_channel_hangup(channel, zstr(cause) ? SWITCH_CAUSE_NORMAL_CLEARING : switch_channel_str2cause(cause)); + switch_channel_hangup(channel, switch_channel_str2cause(cause)); this->end_allow_threads(); }