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

GRIB-724: CRASH: grib_nearest_find_multiple on lambert grid

This commit is contained in:
Shahram Najm 2015-03-06 11:36:05 +00:00
parent c1ade3918b
commit a30a981ad4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/grib_nearest_class_lambert_conformal.c
View File

@ -169,6 +169,15 @@ static int find(grib_nearest* nearest, grib_handle* h,
return ret;
radius=((double)iradius)/1000.0;
neighbours = (PointStore*)grib_context_malloc( nearest->context, nvalues*sizeof(PointStore) );
for(i=0; i<nvalues; ++i) {
neighbours[i].m_dist = 1e10; /* set all distances to large number to begin with */
neighbours[i].m_lat=0;
neighbours[i].m_lon=0;
neighbours[i].m_value=0;
neighbours[i].m_index=0;
}
if (!nearest->h || (flags & GRIB_NEAREST_SAME_GRID)==0) {
double the_value = 0;
double min_dist = 1e10;
@ -199,11 +208,6 @@ static int find(grib_nearest* nearest, grib_handle* h,
self->lons=(double*)grib_context_malloc( nearest->context, nvalues*sizeof(double));
if (!self->lons) return GRIB_OUT_OF_MEMORY;
neighbours = (PointStore*)grib_context_malloc( nearest->context, nvalues*sizeof(PointStore) );
for(i=0; i<nvalues; ++i) {
neighbours[i].m_dist = 1e10; /* set all distances to large number to begin with */
}
iter=grib_iterator_new(h,0,&ret);
if (ret) return ret;
/* First pass: collect all latitudes and longitudes */