[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  0ca2e82ab1575f9c4eed259c4d66ca9372a45bf5 (commit)
      from  8a07e27cd83adc4779a92e447b44a5a65c51c34d (commit)


- Log -----------------------------------------------------------------
commit 0ca2e82ab1575f9c4eed259c4d66ca9372a45bf5
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Feb 6 17:07:58 2016 +0000

    if no comparison function set make sk_sort no op
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/stack/stack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/stack/stack.c b/crypto/stack/stack.c
index 286f290..d486f33 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -336,7 +336,7 @@ void *sk_set(_STACK *st, int i, void *value)
 
 void sk_sort(_STACK *st)
 {
-    if (st && !st->sorted) {
+    if (st && !st->sorted && st->comp != NULL) {
         int (*comp_func) (const void *, const void *);
 
         /*