From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 21 Oct 2015 15:53:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=895a98dbaf9619c8a24ef872bfeca84a764a6ccb;p=thirdparty%2Ftor.git

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

895a98dbaf9619c8a24ef872bfeca84a764a6ccb
diff --cc src/common/tortls.c
index 156750853e,b597fe2331..d8635675f8
--- 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;