cdfCopyRecord: incorrect checksum for freed object [Bug #5461]

1d421608 · Uwe Schulzweida · d3675972 · 1d421608 · 1d421608
Commit 1d421608 authored Feb 02, 2015 by Uwe Schulzweida
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

ChangeLog ChangeLog +5 -1

src/stream_cdf.c src/stream_cdf.c +3 -2

No files found.
--- a/ChangeLog
+++ b/ChangeLog
-2015-01-22  Uwe Schulzweida
+2015-02-12  Uwe Schulzweida

 	* Version 1.6.8 released

+2015-02-02  Uwe Schulzweida
+
+	* cdfCopyRecord: incorrect checksum for freed object [Bug #5461]
+
 2015-01-16  Uwe Schulzweida

 	* cdiDecodeTimevalue: round seconds for TUNIT_SECOND (bug fix)

--- a/src/stream_cdf.c
+++ b/src/stream_cdf.c
@@ -620,7 +620,8 @@ void cdfCopyRecord(stream_t *streamptr2, stream_t *streamptr1)
  int memtype  = MEMTYPE_DOUBLE;
  int vlistID1 = streamptr1->vlistID;
  int tsID1    = streamptr1->curTsID;
-  int recID1   = streamptr1->tsteps[tsID1].curRecID;
+  int vrecID   = streamptr1->tsteps[tsID1].curRecID;
+  int recID1   = streamptr1->tsteps[tsID1].recIDs[vrecID];
  int ivarID   = streamptr1->tsteps[tsID1].records[recID1].varID;
  int gridID   = vlistInqVarGrid(vlistID1, ivarID);
  int datasize = gridInqSize(gridID);
@@ -4999,7 +5000,7 @@ void cdfScanVarAttributes(int nvars, ncvar_t *ncvars, ncdim_t *ncdims,
                  for ( int i = 0; i < nvdims; ++i ) ncvars[ncvarid].chunks[i] = (int)chunks[i];
                  if ( CDI_Debug )
                    {
-                      fprintf(stderr, "\nchunking %d %d %d\nchunks ", storage_in, NC_CONTIGUOUS, NC_CHUNKED);
+                      fprintf(stderr, "%s: chunking %d %d %d  chunks ", name, storage_in, NC_CONTIGUOUS, NC_CHUNKED);
                      for ( int i = 0; i < nvdims; ++i ) fprintf(stderr, "%ld ", chunks[i]);
                      fprintf(stderr, "\n");
                    }