From 560256d26b6e1a522c25b547b269daec5d76ad46 Mon Sep 17 00:00:00 2001 From: Hendi Date: Mon, 23 Jan 2023 23:44:05 +0100 Subject: [PATCH] Remove dead code from CRCInput::getMsg_us() The two events in question are posted in CInfoViewer::getEPG() and they're handled in CRemoteControl::handleMsg(). They are written to the high/low priority pipes only, so there should be no way that they end up in the event socket, which is what the code path in question here deals with. Apart from that, the type the buffer was casted to was completely wrong, so if this code was ever executed, it would have faulted. --- src/driver/rcinput.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 0325f6999..3a236be39 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -1289,20 +1289,9 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6 else printf("[neutrino] event - unknown initiatorID 0x%x\n", emsg.initiatorID); - switch (emsg.eventID) { - case NeutrinoMessages::EVT_CURRENTEPG: - case NeutrinoMessages::EVT_NEXTEPG: - { - CSectionsdClient::CurrentNextInfo *cn = (CSectionsdClient::CurrentNextInfo *) p; - delete [] cn; - p = NULL; - break; - } - default: - if (!dont_delete_p) { - delete[] p; - p = NULL; - } + if (!dont_delete_p) { + delete[] p; + p = NULL; } } }