mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* build-packet.c (write_header2): If a suggested header length is provided
along with a zero length, interpret this as an actual zero length packet and not as an indeterminate length packet. (do_comment, do_user_id): Use it here as these packets might be naturally zero length. * parse-packet.c (parse): Show packet type when failing due to an indeterminate length packet. * misc.c (parse_options): Only provide args for the true (i.e. not "no-xxx") form of options.
This commit is contained in:
parent
c9aa5000d7
commit
95d05215c3
4 changed files with 58 additions and 36 deletions
16
g10/misc.c
16
g10/misc.c
|
@ -1,5 +1,5 @@
|
|||
/* misc.c - miscellaneous functions
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
|
||||
* 2004 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
|
@ -771,11 +771,17 @@ parse_options(char *str,unsigned int *options,
|
|||
}
|
||||
|
||||
if(rev)
|
||||
*options&=~opts[i].bit;
|
||||
{
|
||||
*options&=~opts[i].bit;
|
||||
if(opts[i].value)
|
||||
*opts[i].value=NULL;
|
||||
}
|
||||
else
|
||||
*options|=opts[i].bit;
|
||||
if(opts[i].value)
|
||||
*opts[i].value=arg?m_strdup(arg):NULL;
|
||||
{
|
||||
*options|=opts[i].bit;
|
||||
if(opts[i].value)
|
||||
*opts[i].value=arg?m_strdup(arg):NULL;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue