[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_2-stable has been updated
       via  402fb1896b2aab5cf887127bbce964554b9c8113 (commit)
      from  a3baa171053547488475709c7197592c66e427cf (commit)


- Log -----------------------------------------------------------------
commit 402fb1896b2aab5cf887127bbce964554b9c8113
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>
    (cherry picked from commit 0ca2e82ab1575f9c4eed259c4d66ca9372a45bf5)

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

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 de437ac..fa50083 100644
--- a/crypto/stack/stack.c
+++ b/crypto/stack/stack.c
@@ -360,7 +360,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 *);
 
         /*