commit ee910bfe2486b9d81885b0852e98b3f1ee5be86d
author David Benjamin <davidben@google.com> Tue Jul 25 22:36:00 2017 -0400
committer David Benjamin <davidben@google.com> Fri Jul 28 21:43:13 2017 +0000
tree eb9d8515fe1387089841389ac44fbd229293afea
parent abbf365b6d53ed3445ba2bb40ffb8d5d07245cd4

Use new STACK_OF helpers.

Bug: 132
Change-Id: Ib9bc3ce5f60d0c5bf7922b3d3ccfcd15ef4972a1
Reviewed-on: https://boringssl-review.googlesource.com/18466
Reviewed-by: David Benjamin <davidben@google.com>

ssl/ssl_asn1.cc

diff --git a/ssl/ssl_asn1.cc b/ssl/ssl_asn1.cc
index a1c53d5..0cf90d1 100644
--- a/ssl/ssl_asn1.cc
+++ b/ssl/ssl_asn1.cc
@@ -92,6 +92,8 @@
 #include <limits.h>
 #include <string.h>
 
+#include <utility>
+
 #include <openssl/buf.h>
 #include <openssl/bytestring.h>
 #include <openssl/err.h>
@@ -678,10 +680,9 @@
     }
 
     if (has_peer) {
-      CRYPTO_BUFFER *buffer = CRYPTO_BUFFER_new_from_CBS(&peer, pool);
-      if (buffer == NULL ||
-          !sk_CRYPTO_BUFFER_push(ret->certs, buffer)) {
-        CRYPTO_BUFFER_free(buffer);
+      UniquePtr<CRYPTO_BUFFER> buffer(CRYPTO_BUFFER_new_from_CBS(&peer, pool));
+      if (!buffer ||
+          !PushToStack(ret->certs, std::move(buffer))) {
         OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
         return nullptr;
       }