Merge branch 'tmp' into v4.5.0-release-branch

This commit is contained in:
Ward Fisher 2017-08-09 14:13:42 -06:00
commit 8251784ec2

View File

@ -1220,7 +1220,8 @@ NC_computeshapes(NC3_INFO* ncp)
if(first_rec == NULL)
first_rec = *vpp;
if((*vpp)->len == UINT32_MAX &&
fIsSet(ncp->flags, NC_64BIT_OFFSET)) /* Flag for large last record */
(fIsSet(ncp->flags, NC_64BIT_OFFSET) ||
fIsSet(ncp->flags, NC_64BIT_DATA))) /* Flag for large last record */
ncp->recsize += (*vpp)->dsizes[0] * (*vpp)->xsz;
else
ncp->recsize += (*vpp)->len;