Crash fix caused by passing null into a shared_ptr reset (aws#164)

rccarper · web-flow · commit 3a450f63207d · 2020-08-25T09:04:54.000-07:00
diff --git a/source/io/TlsOptions.cpp b/source/io/TlsOptions.cpp
@@ -258,11 +258,21 @@ namespace Aws
             {
                 if (mode == TlsMode::CLIENT)
                 {
-                    m_ctx.reset(aws_tls_client_ctx_new(allocator, &options.m_options), aws_tls_ctx_destroy);
+                    aws_tls_ctx *underlying_tls_ctx = aws_tls_client_ctx_new(allocator, &options.m_options);
+
+                    if (underlying_tls_ctx != NULL)
+                    {
+                        m_ctx.reset(underlying_tls_ctx, aws_tls_ctx_destroy);
+                    }
                 }
                 else
                 {
-                    m_ctx.reset(aws_tls_server_ctx_new(allocator, &options.m_options), aws_tls_ctx_destroy);
+                    aws_tls_ctx *underlying_tls_ctx = aws_tls_server_ctx_new(allocator, &options.m_options);
+
+                    if (underlying_tls_ctx != NULL)
+                    {
+                        m_ctx.reset(underlying_tls_ctx, aws_tls_ctx_destroy);
+                    }
                 }
 
                 if (!m_ctx)

Original file line number	Diff line number	Diff line change
`@@ -258,11 +258,21 @@ namespace Aws`
`258`	`258`	`{`
`259`	`259`	`if (mode == TlsMode::CLIENT)`
`260`	`260`	`{`
`261`		`- m_ctx.reset(aws_tls_client_ctx_new(allocator, &options.m_options), aws_tls_ctx_destroy);`
	`261`	`+ aws_tls_ctx *underlying_tls_ctx = aws_tls_client_ctx_new(allocator, &options.m_options);`
	`262`	`+`
	`263`	`+ if (underlying_tls_ctx != NULL)`
	`264`	`+ {`
	`265`	`+ m_ctx.reset(underlying_tls_ctx, aws_tls_ctx_destroy);`
	`266`	`+ }`
`262`	`267`	`}`
`263`	`268`	`else`
`264`	`269`	`{`
`265`		`- m_ctx.reset(aws_tls_server_ctx_new(allocator, &options.m_options), aws_tls_ctx_destroy);`
	`270`	`+ aws_tls_ctx *underlying_tls_ctx = aws_tls_server_ctx_new(allocator, &options.m_options);`
	`271`	`+`
	`272`	`+ if (underlying_tls_ctx != NULL)`
	`273`	`+ {`
	`274`	`+ m_ctx.reset(underlying_tls_ctx, aws_tls_ctx_destroy);`
	`275`	`+ }`
`266`	`276`	`}`
`267`	`277`
`268`	`278`	`if (!m_ctx)`