Skip to content

Commit

Permalink
Merge pull request #2035 from DennisHeimbigner/badchunkpath.dmh
Browse files Browse the repository at this point in the history
Fix chunk key when using dimension_separator - high priority
  • Loading branch information
WardF committed Jul 19, 2021
2 parents 2ba84ea + 8cdf594 commit 847c12e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

name: Run netCDF Tests

on: [pull_request,push]
on: [pull_request]

jobs:

Expand Down
1 change: 1 addition & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release

## 4.8.1 - TBD

* [Bug Fix] Fix dimension_separator bug in libnczarr. See [Github #2035](https://github.com/Unidata/netcdf-c/issues/2035).
* [Bug Fix] Fix bugs in libdap4. See [Github #2005](https://github.com/Unidata/netcdf-c/issues/2005).
* [Bug Fix] Store NCZarr fillvalue as a singleton instead of a 1-element array. See [Github #2017](https://github.com/Unidata/netcdf-c/issues/2017).
* [Bug Fixes] The netcdf-c library was incorrectly determining the scope of dimension; similar to the type scope problem. See [Github #2012](https://github.com/Unidata/netcdf-c/pull/2012) for more information.
Expand Down
4 changes: 1 addition & 3 deletions libnczarr/zutil.c
Original file line number Diff line number Diff line change
Expand Up @@ -894,13 +894,11 @@ NCZ_chunkpath(struct ChunkKey key,char dimsep)
{
size_t plen = nulllen(key.varkey)+1+nulllen(key.chunkkey);
char* path = (char*)malloc(plen+1);
char sdimsep[2];

if(path == NULL) return NULL;
path[0] = '\0';
strlcat(path,key.varkey,plen+1);
sdimsep[0] = dimsep; sdimsep[1] = '\0';
strlcat(path,sdimsep,plen+1);
strlcat(path,"/",plen+1);
strlcat(path,key.chunkkey,plen+1);
return path;
}

0 comments on commit 847c12e

Please sign in to comment.