commit 3fa65f0f05f67615d9daf48940e07f84d094ac6e
author David Benjamin <davidben@chromium.org> Fri May 15 19:11:57 2015 -0400
committer Adam Langley <agl@google.com> Thu May 21 18:00:10 2015 +0000
tree 9c4c6b56547b20c13098624e4442f1fad6941ffd
parent 0b635c52b241af78b69addecbb84c7d55f3cabb4

Fix some malloc test crashs.

This isn't exhaustive. There are still failures in some tests which probably
ought to get C++'d first.

Change-Id: Iac58df9d98cdfd94603d54374a531b2559df64c3
Reviewed-on: https://boringssl-review.googlesource.com/4795
Reviewed-by: Adam Langley <agl@google.com>

ssl/pqueue/pqueue_test.c

diff --git a/ssl/pqueue/pqueue_test.c b/ssl/pqueue/pqueue_test.c
index cb688f7..5a68fc4 100644
--- a/ssl/pqueue/pqueue_test.c
+++ b/ssl/pqueue/pqueue_test.c
@@ -72,7 +72,7 @@
   for (i = 0; i < NUM_ITEMS; i++) {
     priority[7] = ordering[i];
     item = pitem_new(priority, &ordering[i]);
-    if (pqueue_insert(q, item) != item) {
+    if (item == NULL || pqueue_insert(q, item) != item) {
       return 0;
     }
   }
@@ -82,7 +82,7 @@
   for (i = 0; i < NUM_ITEMS; i++) {
     priority[7] = ordering[i];
     item = pitem_new(priority, &ordering[i]);
-    if (pqueue_insert(q, item) != NULL) {
+    if (item == NULL || pqueue_insert(q, item) != NULL) {
       return 0;
     }
     pitem_free(item);

ssl/ssl_test.cc

diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc
index 7886304..4de50fd 100644
--- a/ssl/ssl_test.cc
+++ b/ssl/ssl_test.cc
@@ -431,6 +431,9 @@
     return false;
   }
   ScopedOpenSSLString rfc_name(SSL_CIPHER_get_rfc_name(cipher));
+  if (!rfc_name) {
+    return false;
+  }
   out->assign(rfc_name.get());
   return true;
 }