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

ECC-425: grib_to_netcdf crash when running out of memory

This commit is contained in:
Shahram Najm 2017-02-02 18:29:06 +00:00
parent f12a2abf60
commit c5b15632e7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/grib_to_netcdf.c
View File

@ -1641,7 +1641,7 @@ static hypercube *new_hypercube(const request *r)
int total = 0, count = 0; int total = 0, count = 0;
int n = 0; int n = 0;
const char *val = 0; const char *val = 0;
Assert(h);
h->r = clone_one_request(r); h->r = clone_one_request(r);
h->cube = empty_request("CUBE"); h->cube = empty_request("CUBE");
@ -1746,8 +1746,10 @@ static hypercube *new_hypercube_from_mars_request(const request *r)
} }
n = count_values(s.c->cube, "axis"); n = count_values(s.c->cube, "axis");
if(n) if(n) {
s.c->compare = (namecmp*)calloc(sizeof(namecmp), n); s.c->compare = (namecmp*)calloc(sizeof(namecmp), n);
Assert(s.c->compare);
}
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
s.c->compare[i] = comparator(get_value(s.c->cube, "axis", i)); s.c->compare[i] = comparator(get_value(s.c->cube, "axis", i));
@ -1771,8 +1773,10 @@ static hypercube *new_simple_hypercube_from_mars_request(const request *r)
free_one_request(s.r); free_one_request(s.r);
n = count_values(s.c->cube, "axis"); n = count_values(s.c->cube, "axis");
if(n) if(n) {
s.c->compare = (namecmp*)calloc(sizeof(namecmp), n); s.c->compare = (namecmp*)calloc(sizeof(namecmp), n);
Assert(s.c->compare);
}
for(i = 0; i < n; i++) for(i = 0; i < n; i++)
s.c->compare[i] = comparator(get_value(s.c->cube, "axis", i)); s.c->compare[i] = comparator(get_value(s.c->cube, "axis", i));