From 7e6d47cc84b863ec87b3229d6241ca38a23151fb Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.mysql.com>
Date: Tue, 6 Feb 2007 22:00:48 +0100
Subject: Fix merge error

---
 extra/yassl/taocrypt/src/asn.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'extra')

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);
-- 
cgit v1.2.1