felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 14:59:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be pickier about $WarningLevel. Make sure it matches the Perl regex: ^\d\d\.\d\d\.\d\d$

Browse Source
This commit is contained in:
Dianne Skoll
2025-09-27 09:38:00 -04:00
parent be04097fbc
commit 5610590fa8
4 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/var.c
View File

@@ -193,7 +193,6 @@ static int latitude_func(int do_set, Value *val)
static int warning_level_func(int do_set, Value *val)
{
int a, b, c;
if (do_set) {
if (val->type != STR_TYPE) return E_BAD_TYPE;
if (!val->v.str || ! (*val->v.str)) {
@@ -201,12 +200,29 @@ static int warning_level_func(int do_set, Value *val)
WarningLevel = NULL;
return OK;
}
if (sscanf(val->v.str, "%d.%d.%d", &a, &b, &c) != 3) {
if (strlen(val->v.str) != 8) {
return E_BAD_NUMBER;
}
/* Must match regex: ^\d\d\.\d\d\.\d\d$ */
if (!isdigit(val->v.str[0]) ||
!isdigit(val->v.str[1]) ||
val->v.str[2] != '.' ||
!isdigit(val->v.str[3]) ||
!isdigit(val->v.str[4]) ||
val->v.str[5] != '.' ||
!isdigit(val->v.str[6]) ||
!isdigit(val->v.str[7])) {
return E_BAD_NUMBER;
}
if (WarningLevel) free((void *) WarningLevel);
WarningLevel = StrDup(val->v.str);
if (!WarningLevel) return E_NO_MEM;
/* If it's the same as VERSION, just leave it as NULL */
if (strcmp(val->v.str, VERSION)) {
WarningLevel = StrDup(val->v.str);
if (!WarningLevel) return E_NO_MEM;
} else {
WarningLevel = NULL;
}
return OK;
}
if (!WarningLevel) {