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

ECC-1170: grib_filter: Fail if key of type double (e.g. values) is assigned to a string

This commit is contained in:
Shahram Najm 2020-11-26 13:40:03 +00:00
parent 537c20c022
commit 49dbde5088
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/grib_accessor_class_gen.c
View File

@ -390,7 +390,8 @@ static int pack_expression(grib_accessor* a, grib_expression* e)
len = 1; len = 1;
ret = grib_expression_evaluate_long(hand, e, &lval); ret = grib_expression_evaluate_long(hand, e, &lval);
if (ret != GRIB_SUCCESS) { if (ret != GRIB_SUCCESS) {
grib_context_log(a->context, GRIB_LOG_ERROR, "Unable to set %s as long", a->name); grib_context_log(a->context, GRIB_LOG_ERROR, "Unable to set %s as long (from %s)",
a->name, e->cclass->name);
return ret; return ret;
} }
/*if (hand->context->debug) /*if (hand->context->debug)
@ -401,6 +402,11 @@ static int pack_expression(grib_accessor* a, grib_expression* e)
case GRIB_TYPE_DOUBLE: { case GRIB_TYPE_DOUBLE: {
len = 1; len = 1;
ret = grib_expression_evaluate_double(hand, e, &dval); ret = grib_expression_evaluate_double(hand, e, &dval);
if (ret != GRIB_SUCCESS) {
grib_context_log(a->context, GRIB_LOG_ERROR, "unable to set %s as double (from %s)",
a->name, e->cclass->name);
return ret;
}
/*if (hand->context->debug) /*if (hand->context->debug)
printf("ECCODES DEBUG grib_accessor_class_gen::pack_expression %s %g\n", a->name, dval);*/ printf("ECCODES DEBUG grib_accessor_class_gen::pack_expression %s %g\n", a->name, dval);*/
return grib_pack_double(a, &dval, &len); return grib_pack_double(a, &dval, &len);
@ -411,7 +417,8 @@ static int pack_expression(grib_accessor* a, grib_expression* e)
len = sizeof(tmp); len = sizeof(tmp);
cval = grib_expression_evaluate_string(hand, e, tmp, &len, &ret); cval = grib_expression_evaluate_string(hand, e, tmp, &len, &ret);
if (ret != GRIB_SUCCESS) { if (ret != GRIB_SUCCESS) {
grib_context_log(a->context, GRIB_LOG_ERROR, "unable to set %s as string", a->name); grib_context_log(a->context, GRIB_LOG_ERROR, "unable to set %s as string (from %s)",
a->name, e->cclass->name);
return ret; return ret;
} }
len = strlen(cval); len = strlen(cval);