From 654d8e0b52987bf8765a40b2dbe6d2d56127df3d Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 13 Aug 2009 11:01:00 +0200 Subject: [PATCH] Added check for NULL arguments to avoid segfaults --- fwp/lib/frsh_fwp/fwp_fna.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/fwp/lib/frsh_fwp/fwp_fna.c b/fwp/lib/frsh_fwp/fwp_fna.c index 8f32ca3..c61666a 100644 --- a/fwp/lib/frsh_fwp/fwp_fna.c +++ b/fwp/lib/frsh_fwp/fwp_fna.c @@ -193,9 +193,11 @@ int fwp_fna_receive_sync(const fna_endpoint_data_t *endpoint, void *buffer, len = fwp_recv(fwp_epoint, buffer, buffer_size, &from_addr, flags); if (len < 0) return len; - - *received_bytes = len; - *from = from_addr; + + if (received_bytes) + *received_bytes = len; + if (from) + *from = from_addr; return 0; } @@ -213,9 +215,11 @@ int fwp_fna_receive_async(const fna_endpoint_data_t *endpoint, void *buffer, len = fwp_recv(fwp_epoint, buffer, buffer_size, &from_addr, flags); if (len < 0) return len; - - *received_bytes = len; - *from = from_addr; + + if (received_bytes) + *received_bytes = len; + if (from) + *from = from_addr; return 0; } -- 2.39.2