security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-09 12:54:23 +01:00
Code Activity

* import.c (collapse_uids): Fix bug 894: possible memory corruption

Browse Source 
around deduplication of user IDs.
This commit is contained in:
David Shaw 2008-03-24 02:28:40 +00:00
parent 537cada38e
commit 766cc26305
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2008-03-23 David Shaw <dshaw@jabberwocky.com>
* import.c (collapse_uids): Fix bug 894: possible memory
corruption around deduplication of user IDs.
2008-03-17 David Shaw <dshaw@jabberwocky.com> 2008-03-17 David Shaw <dshaw@jabberwocky.com>
* parse-packet.c (parse_key): Parse a secret key encrypted with * parse-packet.c (parse_key): Parse a secret key encrypted with

21
g10/import.c
View File

@ -1654,11 +1654,17 @@ collapse_uids( KBNODE *keyblock )
{ {
KBNODE uid2; KBNODE uid2;
if(is_deleted_kbnode(uid1))
continue;
if(uid1->pkt->pkttype!=PKT_USER_ID) if(uid1->pkt->pkttype!=PKT_USER_ID)
continue; continue;
for(uid2=uid1->next;uid2;uid2=uid2->next) for(uid2=uid1->next;uid2;uid2=uid2->next)
{ {
if(is_deleted_kbnode(uid2))
continue;
if(uid2->pkt->pkttype!=PKT_USER_ID) if(uid2->pkt->pkttype!=PKT_USER_ID)
continue; continue;
@ -1674,6 +1680,9 @@ collapse_uids( KBNODE *keyblock )
uid1 */ uid1 */
for(last=uid2;last->next;last=last->next) for(last=uid2;last->next;last=last->next)
{ {
if(is_deleted_kbnode(last))
continue;
if(last->next->pkt->pkttype==PKT_USER_ID if(last->next->pkt->pkttype==PKT_USER_ID
|| last->next->pkt->pkttype==PKT_PUBLIC_SUBKEY || last->next->pkt->pkttype==PKT_PUBLIC_SUBKEY
|| last->next->pkt->pkttype==PKT_SECRET_SUBKEY) || last->next->pkt->pkttype==PKT_SECRET_SUBKEY)
@ -1686,13 +1695,16 @@ collapse_uids( KBNODE *keyblock )
/* Now put uid2 in place as part of uid1 */ /* Now put uid2 in place as part of uid1 */
last->next=uid1->next; last->next=uid1->next;
uid1->next=uid2; uid1->next=uid2;
remove_kbnode(keyblock,uid2); delete_kbnode(uid2);
/* Now dedupe uid1 */ /* Now dedupe uid1 */
for(sig1=uid1->next;sig1;sig1=sig1->next) for(sig1=uid1->next;sig1;sig1=sig1->next)
{ {
KBNODE sig2; KBNODE sig2;
if(is_deleted_kbnode(sig1))
continue;
if(sig1->pkt->pkttype==PKT_USER_ID if(sig1->pkt->pkttype==PKT_USER_ID
|| sig1->pkt->pkttype==PKT_PUBLIC_SUBKEY || sig1->pkt->pkttype==PKT_PUBLIC_SUBKEY
|| sig1->pkt->pkttype==PKT_SECRET_SUBKEY) || sig1->pkt->pkttype==PKT_SECRET_SUBKEY)
@ -1703,6 +1715,9 @@ collapse_uids( KBNODE *keyblock )
for(sig2=sig1->next,last=sig1;sig2;last=sig2,sig2=sig2->next) for(sig2=sig1->next,last=sig1;sig2;last=sig2,sig2=sig2->next)
{ {
if(is_deleted_kbnode(sig2))
continue;
if(sig2->pkt->pkttype==PKT_USER_ID if(sig2->pkt->pkttype==PKT_USER_ID
|| sig2->pkt->pkttype==PKT_PUBLIC_SUBKEY || sig2->pkt->pkttype==PKT_PUBLIC_SUBKEY
|| sig2->pkt->pkttype==PKT_SECRET_SUBKEY) || sig2->pkt->pkttype==PKT_SECRET_SUBKEY)
@ -1716,7 +1731,7 @@ collapse_uids( KBNODE *keyblock )
{ {
/* We have a match, so delete the second /* We have a match, so delete the second
signature */ signature */
remove_kbnode(&uid1,sig2); delete_kbnode(sig2);
sig2=last; sig2=last;
} }
} }
@ -1725,6 +1740,8 @@ collapse_uids( KBNODE *keyblock )
} }
} }
commit_kbnode(keyblock);
if(any && !opt.quiet) if(any && !opt.quiet)
{ {
const char *key="???"; const char *key="???";