X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=ssl%2Fpqueue.c;h=2e9ceeccd92a22c8aac43c36bfd46843d62d4917;hb=b3e6d666e351d45e93d29fe3813245b92a0f5815;hp=ee64eb32ca94471126e87ab2005bf36b61dfd6d4;hpb=f00d0fd783a8384cb29257bb1cb84b20f33b7df2;p=openssl.git diff --git a/ssl/pqueue.c b/ssl/pqueue.c index ee64eb32ca..2e9ceeccd9 100644 --- a/ssl/pqueue.c +++ b/ssl/pqueue.c @@ -1,13 +1,13 @@ /* - * Copyright 2005-2017 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 + * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html */ -#include "ssl_locl.h" +#include "ssl_local.h" #include struct pqueue_st { @@ -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; }