[MBEDTLS] Sync to v2.2.1. By Ismael Ferreras Morezuelas. CORE-10817

[reactos.git] / reactos / dll / 3rdparty / mbedtls / asn1write.c

diff --git a/reactos/dll/3rdparty/mbedtls/asn1write.c b/reactos/dll/3rdparty/mbedtls/asn1write.c
index 456660d..00ed73c 100644 (file)
--- a/reactos/dll/3rdparty/mbedtls/asn1write.c
+++ b/reactos/dll/3rdparty/mbedtls/asn1write.c
@@ -339,19 +339,18 @@ mbedtls_asn1_named_data *mbedtls_asn1_store_named_data( mbedtls_asn1_named_data
     }
     else if( cur->val.len < val_len )
     {
-        // Enlarge existing value buffer if needed
-        //
-        mbedtls_free( cur->val.p );
-        cur->val.p = NULL;
+        /*
+         * Enlarge existing value buffer if needed
+         * Preserve old data until the allocation succeeded, to leave list in
+         * a consistent state in case allocation fails.
+         */
+        void *p = mbedtls_calloc( 1, val_len );
+        if( p == NULL )
+            return( NULL );
 
+        mbedtls_free( cur->val.p );
+        cur->val.p = p;
         cur->val.len = val_len;
-        cur->val.p = mbedtls_calloc( 1, val_len );
-        if( cur->val.p == NULL )
-        {
-            mbedtls_free( cur->oid.p );
-            mbedtls_free( cur );
-            return( NULL );
-        }
     }
 
     if( val != NULL )