]> rtime.felk.cvut.cz Git - frescor/fwp.git/commitdiff
Added check for NULL arguments to avoid segfaults
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 13 Aug 2009 09:01:00 +0000 (11:01 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 13 Aug 2009 09:01:00 +0000 (11:01 +0200)
fwp/lib/frsh_fwp/fwp_fna.c

index 8f32ca3358cba6602beb9b4b8382fa6c13597ca5..c61666ac02a191bf1aa26aefef0ac73753716403 100644 (file)
@@ -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;
 }