release 1.5.20-4 w/out sidebar-newmail patch

[software/mutt-debian.git] / score.c

diff --git a/score.c b/score.c
index 79ce762f6ea75c849f6f2e348a26ac5a2f0755dc..b8a1f6cd604590edeb27bf1d0d59a34214628638 100644 (file)
--- a/score.c
+++ b/score.c
@@ -34,7 +34,7 @@ typedef struct score_t
   struct score_t *next;
 } SCORE;
 
   struct score_t *next;
 } SCORE;
 

-SCORE *Score = NULL;
+static SCORE *Score = NULL;

 
 void mutt_check_rescore (CONTEXT *ctx)
 {
 
 void mutt_check_rescore (CONTEXT *ctx)
 {


@@ -116,7 +116,12 @@ int mutt_parse_score (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
     ptr->exact = 1;
     pc++;
   }
     ptr->exact = 1;
     pc++;
   }

-  ptr->val = atoi (pc);
+  if (mutt_atoi (pc, &ptr->val) < 0)
+  {
+    FREE (&pattern);
+    strfcpy (err->data, _("Error: score: invalid number"), err->dsize);
+    return (-1);
+  }

   set_option (OPTNEEDRESCORE);
   return 0;
 }
   set_option (OPTNEEDRESCORE);
   return 0;
 }