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

ECC-579 fix

This commit is contained in:
Enrico Fucile 2017-11-06 16:31:36 +00:00
parent 8b190cf511
commit 4b2fe43e24
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/grib_accessor_class_bufr_data_array.c
View File

@ -2255,7 +2255,7 @@ static void set_input_bitmap(grib_handle* h,grib_accessor_bufr_data_array *self)
static int process_elements(grib_accessor* a,int flag,long onlySubset,long startSubset,long endSubset)
{
int err=0;
long inr,innr,ir;
long inr,innr,ir,ip;
long n[MAX_NESTED_REPLICATIONS]={0,};
long nn[MAX_NESTED_REPLICATIONS]={0,};
long numberOfElementsToRepeat[MAX_NESTED_REPLICATIONS]={0,};
@ -2395,6 +2395,8 @@ static int process_elements(grib_accessor* a,int flag,long onlySubset,long start
}
elementIndex=0;
numberOfNestedRepetitions=0;
inr=0;
for (i=0;i<numberOfDescriptors;i++) {
grib_context_log(c, GRIB_LOG_DEBUG,"BUFR data processing: elementNumber=%ld code=%6.6ld", icount++,descriptors[i]->code);
switch(descriptors[i]->F) {
@ -2434,9 +2436,16 @@ static int process_elements(grib_accessor* a,int flag,long onlySubset,long start
n[inr-1]-=numberOfElementsToRepeat[inr]+2;
/* if the empty nested repetition is at the end of the nesting repetition
we need to re-point to the start of the nesting repetition */
if (n[inr-1]==0) {
nn[inr-1]--;
if (nn[inr-1]<=0) numberOfNestedRepetitions--;
ip=inr-1;
while (ip>=0 && n[ip]==0) {
nn[ip]--;
if (nn[ip]<=0) {
numberOfNestedRepetitions--;
} else {
n[ip]=numberOfElementsToRepeat[ip];
i=startRepetition[ip];
}
ip--;
}
}
numberOfNestedRepetitions--;