]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.7'
authorNick Mathewson <nickm@torproject.org>
Wed, 21 Oct 2015 15:53:00 +0000 (11:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 21 Oct 2015 15:53:00 +0000 (11:53 -0400)
1  2 
src/common/tortls.c

index 156750853e11be5aed1c6ff328f825d684891675,b597fe2331e42b1a0b47d86f1d3d047f3b6a1a56..d8635675f8227cb2d0b8e7c024f70909f69e3b49
@@@ -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;