diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2018-07-17 01:28:27 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2018-07-17 01:28:27 (GMT) |
| commit | 073e0b1f0312ac93927e511e2c48d89728e91987 (patch) | |
| tree | 735b8c9e1798a7163c300751829229c8e64799aa /src/H5Shyper.c | |
| parent | 55666ace551369b3d72430c090ab9f1571e1be75 (diff) | |
| download | hdf5-073e0b1f0312ac93927e511e2c48d89728e91987.zip hdf5-073e0b1f0312ac93927e511e2c48d89728e91987.tar.gz hdf5-073e0b1f0312ac93927e511e2c48d89728e91987.tar.bz2 | |
Fixed HDFFV-10476, HDFFV-10478, HDFFV-10480
Description:
Fixed potential out of bound read and NULL pointer dereferences.
Platforms tested:
Linux/64 (jelly)
Linux/32 (jam)
Darwin (osx1010test)
Diffstat (limited to 'src/H5Shyper.c')
| -rw-r--r-- | src/H5Shyper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 5653209..e1587b9 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -5903,7 +5903,7 @@ H5S__hyper_make_spans(unsigned rank, const hsize_t *start, const hsize_t *stride last_span = NULL; /* Generate all the span segments for this dimension */ - for(u = 0, stride_iter = 0; u < count[i]; u++, stride_iter += stride[i]) { + for(u = 0, stride_iter = 0; u < count[i]; u++, stride_iter += stride[i]) { H5S_hyper_span_t *span; /* New hyperslab span */ /* Allocate a span node */ @@ -5945,7 +5945,8 @@ H5S__hyper_make_spans(unsigned rank, const hsize_t *start, const hsize_t *stride } /* end for */ /* Indicate that there is a pointer to this tree */ - down->count = 1; + if(down) + down->count = 1; /* Success! Return the head of the list in the slowest changing dimension */ ret_value = down; |