Merge pull request #222 from jainvikas8/zeroize-check

Check for zero length and NULL buffer pointer.
ARMmbed · Sep 5, 2019 · 595643c · 595643c
2 parents c12cb52 + 52fa174
commit 595643c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/library/platform_util.c b/library/platform_util.c
@@ -72,7 +72,10 @@ static void * (* const volatile memset_func)( void *, int, size_t ) = memset;
 
 void mbedtls_platform_zeroize( void *buf, size_t len )
 {
-    memset_func( buf, 0, len );
+    MBEDTLS_INTERNAL_VALIDATE( len == 0 || buf != NULL );
+
+    if( len > 0 )
+        memset_func( buf, 0, len );
 }
 #endif /* MBEDTLS_PLATFORM_ZEROIZE_ALT */