commit cb5123fa86982c75f2c8061b58ac51c9e9938fdb
author Andres Amaya Garcia <andres.amayagarcia@arm.com> Wed Dec 06 09:39:23 2017 +0000
committer Andres Amaya Garcia <andres.amayagarcia@arm.com> Tue Jan 23 19:37:44 2018 +0000
tree d5a65181b0aac05763d9850045da8da9e180be0e
parent f1ee63562aa6bd42603adc61cda158b9fe109360

Ensure memcpy is not called with NULL and 0 args in x509 module

library/x509_crl.c

diff --git a/library/x509_crl.c b/library/x509_crl.c
index 8f98d8c..9422457 100644
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@@ -294,7 +294,9 @@
     /*
      * Copy raw DER-encoded CRL
      */
-    if( buflen != 0 && ( ( p = mbedtls_calloc( 1, buflen ) ) == NULL ) )
+    if( buflen == 0 )
+        return( MBEDTLS_ERR_X509_INVALID_FORMAT );
+    else if( ( p = mbedtls_calloc( 1, buflen ) ) == NULL )
         return( MBEDTLS_ERR_X509_ALLOC_FAILED );
 
     memcpy( p, buf, buflen );