core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

g1end_of_interval_monthly: Check month is valid

This commit is contained in:
Shahram Najm 2023-12-17 16:38:45 +00:00
parent c728bebd2b
commit 42be7969f2
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/grib_accessor_class_g1end_of_interval_monthly.cc
View File

@ -117,8 +117,7 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN; a->flags |= GRIB_ACCESSOR_FLAG_HIDDEN;
self->number_of_elements = 6; self->number_of_elements = 6;
self->v = (double*)grib_context_malloc(a->context, self->v = (double*)grib_context_malloc(a->context, sizeof(double) * self->number_of_elements);
sizeof(double) * self->number_of_elements);
a->length = 0; a->length = 0;
a->dirty = 1; a->dirty = 1;
@ -127,8 +126,8 @@ static void init(grib_accessor* a, const long l, grib_arguments* c)
static int unpack_double(grib_accessor* a, double* val, size_t* len) static int unpack_double(grib_accessor* a, double* val, size_t* len)
{ {
grib_accessor_g1end_of_interval_monthly* self = (grib_accessor_g1end_of_interval_monthly*)a; grib_accessor_g1end_of_interval_monthly* self = (grib_accessor_g1end_of_interval_monthly*)a;
int ret = 0; int ret = 0;
char verifyingMonth[7] = {0,}; char verifyingMonth[7] = {0,};
size_t slen = 7; size_t slen = 7;
long year = 0, month = 0, date = 0; long year = 0, month = 0, date = 0;
const long mdays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; const long mdays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
@ -144,6 +143,9 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
return ret; return ret;
date = atoi(verifyingMonth); date = atoi(verifyingMonth);
if (date < 0) {
return GRIB_INVALID_ARGUMENT;
}
year = date / 100; year = date / 100;
month = date - year * 100; month = date - year * 100;
if (month == 2) { if (month == 2) {
@ -151,9 +153,10 @@ static int unpack_double(grib_accessor* a, double* val, size_t* len)
if (year % 400 == 0 || (year % 4 == 0 && year % 100 != 0)) if (year % 400 == 0 || (year % 4 == 0 && year % 100 != 0))
days = 29; days = 29;
} }
else else {
if (month < 1 || month > 12) return GRIB_INVALID_ARGUMENT;
days = mdays[month - 1]; days = mdays[month - 1];
}
self->v[0] = year; self->v[0] = year;
self->v[1] = month; self->v[1] = month;
@ -217,13 +220,11 @@ static int compare(grib_accessor* a, grib_accessor* b)
b->dirty = 1; b->dirty = 1;
a->dirty = 1; a->dirty = 1;
grib_unpack_double(a, aval, &alen); err = grib_unpack_double(a, aval, &alen); if(err) return err;
grib_unpack_double(b, bval, &blen); err = grib_unpack_double(b, bval, &blen); if(err) return err;
while (alen != 0) { for(size_t i=0; i<alen && retval == GRIB_SUCCESS; ++i) {
if (*bval != *aval) if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
retval = GRIB_DOUBLE_VALUE_MISMATCH;
alen--;
} }
grib_context_free(a->context, aval); grib_context_free(a->context, aval);