diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:13:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:13:54 +0200 |
| commit | 1fd8150a5b5e3f56aa3c253225929a07ee9a4026 (patch) | |
| tree | 6fb814b28d2a0b8227b7a9f835f2b888c2a2596f /extra | |
| parent | 60561ae6133cf40f4fc445e1d6e8f395a20b2573 (diff) | |
| parent | 115a2967563d3ac734ce371260098710ba42cdf0 (diff) | |
| download | mariadb-git-1fd8150a5b5e3f56aa3c253225929a07ee9a4026.tar.gz | |
5.1 merge
increase xtradb verson from 13.0 to 13.01
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/src/asn.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp index a502666d15b..5ec4cac1c44 100644 --- a/extra/yassl/taocrypt/src/asn.cpp +++ b/extra/yassl/taocrypt/src/asn.cpp @@ -758,6 +758,10 @@ void CertDecoder::GetName(NameType nt) while (source_.get_index() < length) { GetSet(); + if (source_.GetError().What() == SET_E) { + source_.SetError(NO_ERROR_E); // extensions may only have sequence + source_.prev(); + } GetSequence(); byte b = source_.next(); |