From 95a8d269bea56c33705ecf230e2c33f88d9cb76a Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 13 Jan 2025 12:59:31 -0500 Subject: [PATCH] fix null reference exception when dealing with VHDR in TIA-102 mode; --- src/host/modem/ModemV24.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/host/modem/ModemV24.cpp b/src/host/modem/ModemV24.cpp index 0a5635c2..07206c11 100644 --- a/src/host/modem/ModemV24.cpp +++ b/src/host/modem/ModemV24.cpp @@ -1182,12 +1182,18 @@ void ModemV24::convertToAirTIA(const uint8_t *data, uint32_t length) ::memcpy(raw, m_rxCall->VHDR1, 18U); ::memcpy(raw + 18U, m_rxCall->VHDR2, 18U); + assert(raw != nullptr); + // buffer for decoded VHDR data uint8_t vhdr[P25_HDU_LENGTH_BYTES]; + ::memset(vhdr, 0x00U, P25_HDU_LENGTH_BYTES); + + assert(vhdr != nullptr); uint32_t offset = 0U; - for (uint32_t i = 0; i < P25_HDU_LENGTH_BYTES; i++, offset += 6) + for (uint32_t i = 0; i < DFSI_VHDR_RAW_LEN; i++, offset += 6) { Utils::hex2Bin(raw[i], vhdr, offset); + } // try to decode the RS data try {