From 23a294e50d4c4fac7f5a288c6778caed73b71248 Mon Sep 17 00:00:00 2001 From: Venugopal S M Date: Thu, 2 Jun 2022 22:57:51 +0530 Subject: [PATCH] [M108 Migration][MM] Ignore buffers if callback is null In "video_onended_event" for no reason, buffers are sent after EOS is received. The read-calback is null and would crash. Reference: https://review.tizen.org/gerrit/275840/ Change-Id: Icccfa6c6e35000c7993139077ade2817232051b5 Signed-off-by: Venugopal S M --- media/mojo/services/mojo_demuxer_stream_adapter.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.cc b/media/mojo/services/mojo_demuxer_stream_adapter.cc index dcd0d901d9c6..0dcbb81b4b69 100644 --- a/media/mojo/services/mojo_demuxer_stream_adapter.cc +++ b/media/mojo/services/mojo_demuxer_stream_adapter.cc @@ -95,6 +95,14 @@ void MojoDemuxerStreamAdapter::OnBufferReady( DCHECK(read_cb_); DCHECK_NE(type_, UNKNOWN); +#if defined(TIZEN_MULTIMEDIA) + if (!read_cb_) { + LOG(INFO) << __func__ << " (" << DemuxerStream::GetTypeName(type_) + << ") ignoring as cb is null!!"; + return; + } +#endif + if (status == kConfigChanged) { UpdateConfig(std::move(audio_config), std::move(video_config)); std::move(read_cb_).Run(kConfigChanged, nullptr); -- 2.34.1