mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
Fix merge error
This commit is contained in:
parent
0bcaf5cf4f
commit
7e6d47cc84
1 changed files with 2 additions and 2 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue