X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=ssl%2Fpqueue.c;h=548a7a443d914545cfaba504a7583f388d8df2f8;hb=bd3d8c12606c48388be61db0681ac759804b6100;hp=9ff4132dcc6c097cdbeaa874001dbb060fd73b72;hpb=8b0e934afbdf8ca61866263c507d4b653135952d;p=openssl.git

diff --git a/ssl/pqueue.c b/ssl/pqueue.c
index 9ff4132dcc..548a7a443d 100644
--- a/ssl/pqueue.c
+++ b/ssl/pqueue.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -18,14 +18,15 @@ struct pqueue_st {
 pitem *pitem_new(unsigned char *prio64be, void *data)
 {
     pitem *item = OPENSSL_malloc(sizeof(*item));
-    if (item == NULL)
+
+    if (item == NULL) {
+        SSLerr(SSL_F_PITEM_NEW, ERR_R_MALLOC_FAILURE);
         return NULL;
+    }
 
     memcpy(item->priority, prio64be, sizeof(item->priority));
-
     item->data = data;
     item->next = NULL;
-
     return item;
 }
 
@@ -34,10 +35,13 @@ void pitem_free(pitem *item)
     OPENSSL_free(item);
 }
 
-pqueue *pqueue_new()
+pqueue *pqueue_new(void)
 {
     pqueue *pq = OPENSSL_zalloc(sizeof(*pq));
 
+    if (pq == NULL)
+        SSLerr(SSL_F_PQUEUE_NEW, ERR_R_MALLOC_FAILURE);
+
     return pq;
 }
 
@@ -127,7 +131,7 @@ pitem *pqueue_iterator(pqueue *pq)
     return pqueue_peek(pq);
 }
 
-pitem *pqueue_next(pitem **item)
+pitem *pqueue_next(piterator *item)
 {
     pitem *ret;
 
@@ -144,7 +148,7 @@ pitem *pqueue_next(pitem **item)
 size_t pqueue_size(pqueue *pq)
 {
     pitem *item = pq->items;
-    int count = 0;
+    size_t count = 0;
 
     while (item != NULL) {
         count++;