diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
| commit | d11829654c4ef5c3d0f997ca61a50d4bd196db8a (patch) | |
| tree | e48a5775e961b17600bf9c1c189243deb5515ba7 /extra | |
| parent | e022b6ef07529d83e8c1cbd5e3d374fc5cc75721 (diff) | |
| parent | 704898bf3200af4da42c1bf9251a7da5533db73f (diff) | |
| download | mariadb-git-d11829654c4ef5c3d0f997ca61a50d4bd196db8a.tar.gz | |
merge with MySQL 5.5.27
manually checked every change, reverted incorrect or stupid changes.
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(); |