From 37ed7694bdad7a5c2dbc7eeece62d342f176ef63 Mon Sep 17 00:00:00 2001 From: gardners Date: Tue, 5 Feb 2013 06:50:06 +1030 Subject: [PATCH] added safety catch for null message field. note that debug.packettx seems to be broken. --- overlay_interface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/overlay_interface.c b/overlay_interface.c index 4087b822..95a1e1e1 100644 --- a/overlay_interface.c +++ b/overlay_interface.c @@ -673,7 +673,7 @@ overlay_broadcast_ensemble(int interface_number, { if (config.debug.packettx) { - DEBUGF("Sending this packet via interface #%d",interface_number); + DEBUGF("Sending this packet via interface #%d (len=%d)",interface_number,len); DEBUG_packet_visualise(NULL,bytes,len); } @@ -887,6 +887,7 @@ void overlay_interface_discover(struct sched_ent *alarm) static void logServalPacket(int level, struct __sourceloc __whence, const char *message, const unsigned char *packet, size_t len) { struct mallocbuf mb = STRUCT_MALLOCBUF_NULL; + if (!message) message=""; if (serval_packetvisualise(XPRINTF_MALLOCBUF(&mb), message, packet, len) == -1) WHY("serval_packetvisualise() failed"); else if (mb.buffer == NULL)