mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* parse-packet.c (parse_plaintext), packet.h, plaintext.c
(handle_plaintext): Fix bug in handling literal packets with zero-length data (no data was being confused with partial body length). * misc.c (pct_expando), options.skel: %t means extension ("jpg"). %T means MIME type ("image/jpeg"). * import.c (import_one): Only trigger trust update if the keyring is actually changed. * export.c (do_export_stream): Missing a m_free.
This commit is contained in:
parent
0f2fedd806
commit
3b9a04844c
8 changed files with 49 additions and 13 deletions
16
g10/misc.c
16
g10/misc.c
|
@ -509,14 +509,22 @@ pct_expando(const char *string,PKT_public_key *pk)
|
|||
}
|
||||
break;
|
||||
|
||||
/* photo type. For now, it's always jpeg so this is
|
||||
/* photo types. For now, it's always jpeg so this is
|
||||
easy! */
|
||||
case 't':
|
||||
if(idx+4>maxlen)
|
||||
if(idx+3>maxlen)
|
||||
goto fail;
|
||||
|
||||
strcpy(&ret[idx],"jpeg");
|
||||
idx+=4;
|
||||
strcpy(&ret[idx],"jpg");
|
||||
idx+=3;
|
||||
break;
|
||||
|
||||
case 'T':
|
||||
if(idx+10>maxlen)
|
||||
goto fail;
|
||||
|
||||
strcpy(&ret[idx],"image/jpeg");
|
||||
idx+=10;
|
||||
break;
|
||||
|
||||
case '%':
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue