From d5b9d165a2c4448e388053f45bc58901ae63a9e4 Mon Sep 17 00:00:00 2001 From: Christopher Wood Date: Sun, 15 Jan 2017 19:18:03 -0800 Subject: [PATCH] Check for NULL before using a decoded message. --- ccnx/forwarder/athena/athena_TransportLinkModuleTCP.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ccnx/forwarder/athena/athena_TransportLinkModuleTCP.c b/ccnx/forwarder/athena/athena_TransportLinkModuleTCP.c index cd868d3..3bee12c 100644 --- a/ccnx/forwarder/athena/athena_TransportLinkModuleTCP.c +++ b/ccnx/forwarder/athena/athena_TransportLinkModuleTCP.c @@ -426,14 +426,14 @@ _TCPReceive(AthenaTransportLink *athenaTransportLink) // Construct, and return a ccnxMetaMessage from the wire format buffer. ccnxMetaMessage = ccnxMetaMessage_CreateFromWireFormatBuffer(wireFormatBuffer); - if (ccnxTlvDictionary_GetSchemaVersion(ccnxMetaMessage) == CCNxTlvDictionary_SchemaVersion_V0) { - parcLog_Warning(athenaTransportLink_GetLogger(athenaTransportLink), - "received deprecated version %d message\n", ccnxTlvDictionary_GetSchemaVersion(ccnxMetaMessage)); - } if (ccnxMetaMessage == NULL) { linkData->_stats.receive_DecodeFailed++; parcLog_Error(athenaTransportLink_GetLogger(athenaTransportLink), "Failed to decode message from received packet."); + } else if (ccnxTlvDictionary_GetSchemaVersion(ccnxMetaMessage) == CCNxTlvDictionary_SchemaVersion_V0) { + parcLog_Warning(athenaTransportLink_GetLogger(athenaTransportLink), + "received deprecated version %d message\n", ccnxTlvDictionary_GetSchemaVersion(ccnxMetaMessage)); } + parcBuffer_Release(&wireFormatBuffer); return ccnxMetaMessage;