Merge remote-tracking branch 'public/pr/1559' into development-proposed
* public/pr/1559:
Make the memset call prior to FD_ZERO conditional to needing it
diff --git a/library/net_sockets.c b/library/net_sockets.c
index f99d339..7b4a423 100644
--- a/library/net_sockets.c
+++ b/library/net_sockets.c
@@ -459,11 +459,15 @@
if( fd < 0 )
return( MBEDTLS_ERR_NET_INVALID_CONTEXT );
- /* Ensure that memory sanitizers consider
- * read_fds and write_fds as initialized even
- * if FD_ZERO is implemented in assembly. */
+#if defined(__has_feature)
+#if __has_feature(memory_sanitizer)
+ /* Ensure that memory sanitizers consider read_fds and write_fds as
+ * initialized even on platforms such as Glibc/x86_64 where FD_ZERO
+ * is implemented in assembly. */
memset( &read_fds, 0, sizeof( read_fds ) );
memset( &write_fds, 0, sizeof( write_fds ) );
+#endif
+#endif
FD_ZERO( &read_fds );
if( rw & MBEDTLS_NET_POLL_READ )