removed VLAs since those are bad, apparently

Author: W3AXL

fw/v24/inc/hdlc.h

@@ -22,6 +22,9 @@ extern "C" {
 
 #define CRC16_CCITT_INIT_VAL 0xFFFF
 
+/* Max size of an HDLC message (255 for now since I haven't seen longer ones yet) */
+#define HDLC_MAX_FRAME_SIZE_BYTES   255U
+
 /* Control Field Bytes */
 #define HDLC_CTRL_RR    0x01    // Receive Ready
 #define HDLC_CTRL_UI    0x03    // Unnumbered Information

fw/v24/src/hdlc.c

@@ -134,21 +134,21 @@ void hdlcEncodeAndSendFrame(const uint8_t *data, const uint8_t len)
     // Calculate FCS of message
     uint16_t fcs = crc16(data, len);
     // Append
-    uint8_t frame[len + 2];
+    uint8_t frame[HDLC_MAX_FRAME_SIZE_BYTES];
     memcpy(&frame, data, len);
     frame[len] = low(fcs);
     frame[len + 1] = high(fcs);
     // Trace
     #ifdef TRACE_HDLC
-    uint8_t hexStrBuf[(len + 2)*4];
+    uint8_t hexStrBuf[HDLC_MAX_FRAME_SIZE_BYTES * 4];
     HexArrayToStr((char*)hexStrBuf, frame, len + 2);
     log_trace("Encoded HDLC: %s", hexStrBuf);
     #endif
     // See if we need to escape anything
     uint8_t escapes = HDLCGetEscapesReq(frame, len + 2);
     if (escapes)
     {
-        uint8_t escFrame[len + 2 + escapes];
+        uint8_t escFrame[HDLC_MAX_FRAME_SIZE_BYTES];
         if (HDLCEscape(escFrame, frame, len + 2) != escapes)
         {
             log_error("Didn't escape the bytes we expected!");
@@ -212,7 +212,7 @@ void HDLCSendRR()
 void HDLCSendUI(uint8_t *msgData, uint8_t len)
 {
     // We need 2 extra bytes for address and control
-    uint8_t data[len + 2];
+    uint8_t data[HDLC_MAX_FRAME_SIZE_BYTES];
     data[0] = peerAddress;
     data[1] = HDLC_CTRL_UI;
     memcpy(&data[2], msgData, len);
@@ -355,7 +355,7 @@ uint8_t HDLCParseMsg(uint8_t* rawMsg, uint8_t rawLen)
 {
     // Debug print hex buffer
     #ifdef TRACE_HDLC
-    uint8_t hexStrBuf[rawLen * 4];
+    uint8_t hexStrBuf[HDLC_MAX_FRAME_SIZE_BYTES * 4];
     #endif
 
     // Incremenet total frames processed
@@ -366,7 +366,7 @@ uint8_t HDLCParseMsg(uint8_t* rawMsg, uint8_t rawLen)
     log_trace("Processing %d-byte HDLC message:%s", rawLen, hexStrBuf);
     #endif
     // Escape
-    uint8_t msg[rawLen];
+    uint8_t msg[HDLC_MAX_FRAME_SIZE_BYTES];
     uint8_t len = rawLen - HDLCUnescape(msg, rawMsg, rawLen);
     #ifdef TRACE_HDLC
     if (len != rawLen)
@@ -380,11 +380,11 @@ uint8_t HDLCParseMsg(uint8_t* rawMsg, uint8_t rawLen)
     uint8_t msg_ctrl = msg[1];
     // Data is bytes 2 to len-2 so buffer size is 4 less
     uint8_t data_len = len - 4;
-    uint8_t msg_data[data_len];
+    /*uint8_t msg_data[HDLC_MAX_FRAME_SIZE_BYTES];
     memset(msg_data, 0, data_len);
-    memcpy(msg_data, &msg[2], (data_len) * sizeof(uint8_t));
+    memcpy(msg_data, &msg[2], (data_len) * sizeof(uint8_t));*/
     #ifdef TRACE_HDLC
-    printHexArray((char*)hexStrBuf, msg_data, data_len);
+    printHexArray((char*)hexStrBuf, msg + 2U, data_len);
     log_trace("Msg data:%s", hexStrBuf);
     #endif
     // Calculate expected FCS by getting the entire message minus the FCS
@@ -433,7 +433,7 @@ uint8_t HDLCParseMsg(uint8_t* rawMsg, uint8_t rawLen)
             log_info("Got UI frame (len: %d)", data_len);
             hdlcLastRx = HAL_GetTick();
             // Write frame to VCP
-            VCPWriteP25Frame(msg_data, data_len);
+            VCPWriteP25Frame(msg + 2U, data_len);
             break;
         default:
             log_warn("Unhandled HDLC control type %02X", msg_ctrl);

fw/v24/src/vcp.c

@@ -237,7 +237,7 @@ void VCPRxCallback()
                         log_debug("Sending UI frame of length %d via HDLC", vcpRxMsgLength - offset - 2U);
                         #endif
                         #ifdef TRACE_VCP
-                        uint8_t hexStrBuf[(vcpRxMsgLength - offset - 2U)*4U];
+                        uint8_t hexStrBuf[VCP_MAX_MSG_LENGTH_BYTES * 4U];
                         HexArrayToStr((char*)hexStrBuf, &vcpRxMsg[offset + 2U], vcpRxMsgLength - offset - 2U);
                         log_trace("P25 Frame: %s", hexStrBuf);
                         #endif
@@ -428,7 +428,7 @@ bool VCPWriteAck(uint8_t cmd)
 bool VCPWriteP25Frame(const uint8_t *data, uint16_t len)
 {
     // Start byte, length byte, cmd byte, and a 0x00 pad to maintain dvm compliance
-    uint8_t buffer[len + 4];
+    uint8_t buffer[VCP_MAX_MSG_LENGTH_BYTES];
     buffer[0] = DVM_SHORT_FRAME_START;
     buffer[1] = (uint8_t)len + 4;
     buffer[2] = CMD_P25_DATA;
@@ -440,7 +440,7 @@ bool VCPWriteP25Frame(const uint8_t *data, uint16_t len)
     log_debug("Writing P25 frame of length %d to VCP", len);
     #endif
     #ifdef TRACE_VCP
-    uint8_t hexStrBuf[(len+3)*4];
+    uint8_t hexStrBuf[VCP_MAX_MSG_LENGTH_BYTES * 4];
     printHexArray((char*)hexStrBuf, buffer, len+3);
     log_trace("Sending %s", hexStrBuf);
     #endif
@@ -469,7 +469,7 @@ void sendVersion()
 
     // HW description
     uint8_t count = 21;
-    for (uint8_t i = 0U; i < sizeof(HARDWARE_STRING); i++, count++)
+    for (uint8_t i = 0U; i < (uint8_t)sizeof(HARDWARE_STRING); i++, count++)
         reply[count] = HARDWARE_STRING[i];
 
     // Total length