mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-15 09:27:09 -05:00
fixed nasty bug causing crashes when syncing the keyring from disc
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5501 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
adfb4ab225
commit
64500289b6
@ -1224,8 +1224,9 @@ bool PGPHandler::mergeKeySignatures(ops_keydata_t *dst,const ops_keydata_t *src)
|
|||||||
{
|
{
|
||||||
uint8_t tag ;
|
uint8_t tag ;
|
||||||
uint32_t length ;
|
uint32_t length ;
|
||||||
|
unsigned char *tmp_data = src->packets[i].raw ; // put it in a tmp variable because read_packetHeader() will modify it!!
|
||||||
|
|
||||||
PGPKeyParser::read_packetHeader(src->packets[i].raw,tag,length) ;
|
PGPKeyParser::read_packetHeader(tmp_data,tag,length) ;
|
||||||
|
|
||||||
if(tag == PGPKeyParser::PGP_PACKET_TAG_SIGNATURE)
|
if(tag == PGPKeyParser::PGP_PACKET_TAG_SIGNATURE)
|
||||||
to_add.insert(src->packets[i]) ;
|
to_add.insert(src->packets[i]) ;
|
||||||
|
Loading…
Reference in New Issue
Block a user