[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

[nickm at torproject.org]

commit 895a98dbaf9619c8a24ef872bfeca84a764a6ccb
Merge: 52fd384 b809c26
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 11:53:00 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.7'

 changes/bug17404    |    6 ++++++
 src/common/tortls.c |    4 ++++
 2 files changed, 10 insertions(+)

diff --cc src/common/tortls.c
index 1567508,b597fe2..d863567
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@@ -2453,9 -2519,12 +2453,13 @@@ dn_indicates_v3_cert(X509_NAME *name
  
    str = X509_NAME_ENTRY_get_data(entry);
    len = ASN1_STRING_to_UTF8(&s, str);
 -  if (len < 0)
 +  if (len < 0) {
      return 0;
 +  }
+   if (len < 4) {
+     OPENSSL_free(s);
+     return 0;
+   }
    r = fast_memneq(s + len - 4, ".net", 4);
    OPENSSL_free(s);
    return r;