address feedback from 36775 (#36839)

dotnet · Apr 13, 2019 · c3981ca · c3981ca
1 parent f5e2679
commit c3981ca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs b/src/Common/src/Interop/Unix/System.Security.Cryptography.Native/Interop.OpenSsl.cs
@@ -125,9 +125,13 @@ internal static SafeSslHandle AllocateSslContext(SslProtocols protocols, SafeX50
                 byte[] cipherList =
                     CipherSuitesPolicyPal.GetOpenSslCipherList(sslAuthenticationOptions.CipherSuitesPolicy, protocols, policy);
 
+                Debug.Assert(cipherList == null || (cipherList.Length >= 1 && cipherList[cipherList.Length - 1] == 0));
+
                 byte[] cipherSuites =
                     CipherSuitesPolicyPal.GetOpenSslCipherSuites(sslAuthenticationOptions.CipherSuitesPolicy, protocols, policy);
 
+                Debug.Assert(cipherSuites == null || (cipherSuites.Length >= 1 && cipherSuites[cipherSuites.Length - 1] == 0));
+
                 unsafe
                 {
                     fixed (byte* cipherListStr = cipherList)

diff --git a/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.c b/src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_ssl.c
@@ -470,7 +470,13 @@ int32_t AppleCryptoNative_SslSetEnabledCipherSuites(SSLContextRef sslContext, co
     else
     {
         // iOS, tvOS, watchOS
-        SSLCipherSuite* cipherSuites16 = (SSLCipherSuite*)malloc(sizeof(SSLCipherSuite) * (size_t)numCipherSuites);
+        SSLCipherSuite* cipherSuites16 = (SSLCipherSuite*)calloc((size_t)numCipherSuites, sizeof(SSLCipherSuite));
+
+        if (cipherSuites16 == NULL)
+        {
+            return errSSLInternal;
+        }
+
         for (int i = 0; i < numCipherSuites; i++)
         {
             cipherSuites16[i] = (SSLCipherSuite)cipherSuites[i];