Fix merge error

7e6d47cc · unknown · 0bcaf5cf · 7e6d47cc
Commit 7e6d47cc authored Feb 06, 2007 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

extra/yassl/taocrypt/src/asn.cpp extra/yassl/taocrypt/src/asn.cpp +2 -2

No files found.
--- 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);
+                memcpy(&ptr[idx], source_.get_current(), length2);
-                idx += length;
+                idx += length2;
            }
            source_.advance(length2);