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

ECC-401: Fix malformed JSON numbers

This commit is contained in:
Shahram Najm 2019-08-28 18:41:33 +01:00
parent a1c1a741bf
commit 34a5134268
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/bufr_ls_json.sh
View File

@ -29,10 +29,7 @@ for file in ${bufr_files}
do
${tools_dir}/bufr_ls -j $file > $tempLog
if test "x$JSON_CHECK" != "x"; then
# TODO: Keys like typicalDate/rdbtimeDate can have
# values like 00121102 or 000000.
# JSON check will fail: malformed number (leading zero must not be followed by another digit)
cat $tempLog | sed '/: 0[0-9]/d' | json_xs -t none
cat $tempLog | json_xs -t none
fi
done

20
tools/grib_tools.c
View File

@ -819,18 +819,30 @@ void grib_skip_check(grib_runtime_options* options,grib_handle* h)
}
/* TODO: Does not work for 2.7e+01 */
static int is_value_a_number(const char* input)
static int is_valid_JSON_number(const char* input)
{
const char *p = input;
if (p == 0 || *p == 0) return 0;
size_t len = 0;
int is_float = 0;
if (p == 0 || *p == '\0') return 0;
if (*p == '-') p++;
while (*p) {
if( *p != '.' && !isdigit(*p)) return 0;
if (*p == '.') is_float=1;
if (*p != '.' && !isdigit(*p)) return 0;
p++;
len++;
}
/*
* Note: BUFR keys like typicalTime/rdbtimetime can have values
* like 000000 or 013329 which are invalid JSON numbers.
* In JSON a leading zero must not be followed by another digit
*/
if (!is_float && len > 2 && input[0]=='0' && isdigit(input[1]))
return 0; /* Not a valid JSON number */
return 1;
}
static void get_value_for_key(grib_handle* h, const char* key_name, int key_type, char* value_str, const char* format)
{
int ret = 0, type = key_type;
@ -961,7 +973,7 @@ void grib_print_key_values(grib_runtime_options* options, grib_handle* h)
for (i=0;i<options->print_keys_count;i++) {
fprintf(dump_file,"\t\"%s\": ", options->print_keys[i].name);
get_value_for_key(h, options->print_keys[i].name, options->print_keys[i].type, value, options->format);
if (is_value_a_number(value))
if (is_valid_JSON_number(value))
fprintf(dump_file,"%s", value);
else
fprintf(dump_file,"\"%s\"", value);