Resolve a stack set-up race condition (if the list of compression

methods isn't presorted, it will be sorted on first read).

Submitted by: Adam Langley

diff --git a/CHANGES b/CHANGES
index 3771698bfd5202165076813d578ec140f51b4540..8c9fd59be0614bae8483c54540c0c95651fb9e9b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.8r and 0.9.8s [xx XXX xxxx]
 
+  *) Fix ssl_ciph.c set-up race.
+     [Adam Langley (Google)]
+
   *) Fix spurious failures in ecdsatest.c.
      [Emilia Käsper (Google)]
 

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index a34680ee8502503c1afb29168c005b65e7a0a877..a54c06ffb7d3e92e12c4382cbc3eb572e1da5155 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -303,6 +303,7 @@ static void load_builtin_compressions(void)
                                                sk_SSL_COMP_push(ssl_comp_methods,comp);
                                                }
                                        }
+                                       sk_SSL_COMP_sort(ssl_comp_methods);
                                }
                        MemCheck_on();
                        }