diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-06 22:00:48 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-06 22:00:48 +0100 |
| commit | 7f4be1e4087ea03df6f42a154f6bff08de0e4358 (patch) | |
| tree | 5cf669a694c4320588b8c6ed2e7d6ce15e81292b /extra | |
| parent | 49c26cfd45f9c727f11af49740f73631896b8886 (diff) | |
| download | mariadb-git-7f4be1e4087ea03df6f42a154f6bff08de0e4358.tar.gz | |
Fix merge error
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/src/asn.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp index 5d1711eebe0..5bc865a4ba7 100644 --- a/extra/yassl/taocrypt/src/asn.cpp +++ b/extra/yassl/taocrypt/src/asn.cpp @@ -743,8 +743,8 @@ void CertDecoder::GetName(NameType nt) memcpy(&ptr[idx], "/emailAddress=", 14); idx += 14; - memcpy(&ptr[idx], source_.get_current(), length); - idx += length; + memcpy(&ptr[idx], source_.get_current(), length2); + idx += length2; } source_.advance(length2); |