From d8bd3a3826683cd356d517220ff40645ebbf9491 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 24 May 2005 09:14:31 +0000 Subject: (add_notation_data): Check number of at-signs. --- g10/ChangeLog | 4 ++++ g10/g10.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index dde6ceb58..86bdce93e 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2005-05-24 Werner Koch + + * g10.c (add_notation_data): Check number of at-signs. + 2005-05-23 Werner Koch * app-openpgp.c, app-common.h: Again updated from gnupg 1.9 CVS. diff --git a/g10/g10.c b/g10/g10.c index 68c550475..f345cb39f 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -3879,7 +3879,7 @@ add_notation_data( const char *string, int which ) for( s=string ; *s != '='; s++ ) { if( *s=='@') - saw_at=1; + saw_at++; if( !*s || !isascii (*s) || (!isgraph(*s) && !isspace(*s)) ) { @@ -3894,6 +3894,12 @@ add_notation_data( const char *string, int which ) log_error(_("a user notation name must contain the '@' character\n")); return; } + if (saw_at > 1) + { + log_error(_("a notation name must contain more than " + "one '@' character\n")); + return; + } /* we only support printable text - therefore we enforce the use * of only printable characters (an empty value is valid) */ -- cgit v1.2.3