eion/purple-hangouts

Fix crash when finishing a voice/video call
draft
2019-02-27, Eion Robb
12ef9a48bd5a
Parents dea7cbaa9af0
Children ba2889e145ac7df90d65f172702793a4c96c
Fix crash when finishing a voice/video call
1 files changed, 12 insertions(+), 4 deletions(-)
  • +12 -4
    hangouts_media.c
    • --- a/hangouts_media.c Tue Feb 19 22:51:46 2019 +1300
    +++ b/hangouts_media.c Wed Feb 27 23:36:29 2019 +1300
    @@ -979,22 +979,30 @@
    // G_CALLBACK(hangouts_media_stream_info_cb), hangouts_media);
    //TODO add params
    - if(!purple_media_add_stream(media, "hangout", hangouts_media->who, hangouts_media->type & PURPLE_MEDIA_AUDIO, TRUE, "nice", num_params, params)) {
    + if(hangouts_media->type & PURPLE_MEDIA_AUDIO &&
    + !purple_media_add_stream(media, "hangout", hangouts_media->who, hangouts_media->type & PURPLE_MEDIA_AUDIO, TRUE, "nice", num_params, params)) {
    +
    purple_media_end(media, NULL, NULL);
    /* TODO: How much clean-up is necessary here? (does calling
    purple_media_end lead to cleaning up Jingle structs?) */
    return;
    }
    - if(!purple_media_add_stream(media, "hangoutv", hangouts_media->who, hangouts_media->type & PURPLE_MEDIA_VIDEO, TRUE, "nice", num_params, params)) {
    + if(hangouts_media->type & PURPLE_MEDIA_VIDEO &&
    + !purple_media_add_stream(media, "hangoutv", hangouts_media->who, hangouts_media->type & PURPLE_MEDIA_VIDEO, TRUE, "nice", num_params, params)) {
    +
    purple_media_end(media, NULL, NULL);
    return;
    }
    #if PURPLE_VERSION_CHECK(2, 10, 12) || PURPLE_VERSION_CHECK(3, 0, 0)
    - if (!purple_media_set_send_rtcp_mux(media, "hangout", hangouts_media->who, TRUE)) {
    + if (hangouts_media->type & PURPLE_MEDIA_AUDIO &&
    + !purple_media_set_send_rtcp_mux(media, "hangout", hangouts_media->who, TRUE)) {
    +
    purple_debug_warning("hangouts", "Unable to set rtcp mux on audio stream");
    }
    - if (!purple_media_set_send_rtcp_mux(media, "hangoutv", hangouts_media->who, TRUE)) {
    + if (hangouts_media->type & PURPLE_MEDIA_VIDEO &&
    + !purple_media_set_send_rtcp_mux(media, "hangoutv", hangouts_media->who, TRUE)) {
    +
    purple_debug_warning("hangouts", "Unable to set rtcp mux on video stream");
    }
    #endif