1 files changed, 7 insertions, 1 deletions
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) */