From 4d9b59c3efb269a6e2c9046ae3653f1c8fbdb3f6 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Fri, 9 Mar 2018 02:54:45 +0700 Subject: [PATCH] Transceiver.cpp: properly zero-terminate received commands Previously it was assumed that a sender should zero-terminate each command being sent. Otherwise, this could cause to printing garbage. Let's do this manually, using the length of received data as a position for '\0'. Change-Id: I69f413f33156c38a853efc5a8cdc66fbfb0ca6af --- Transceiver52M/Transceiver.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp index 7dc4c1c6..8f41c5e4 100644 --- a/Transceiver52M/Transceiver.cpp +++ b/Transceiver52M/Transceiver.cpp @@ -661,20 +661,20 @@ void Transceiver::reset() void Transceiver::driveControl(size_t chan) { - // check control socket - char buffer[MAX_PACKET_LENGTH]; - int msgLen = -1; - buffer[0] = '\0'; + char buffer[MAX_PACKET_LENGTH + 1]; + char response[MAX_PACKET_LENGTH + 1]; + int msgLen; - msgLen = mCtrlSockets[chan]->read(buffer, sizeof(buffer)); - - if (msgLen < 1) { + /* Attempt to read from control socket */ + msgLen = mCtrlSockets[chan]->read(buffer, MAX_PACKET_LENGTH); + if (msgLen < 1) return; - } + + /* Zero-terminate received string */ + buffer[msgLen] = '\0'; char cmdcheck[4]; char command[MAX_PACKET_LENGTH]; - char response[MAX_PACKET_LENGTH]; sscanf(buffer,"%3s %s",cmdcheck,command);