| 12345678910111213141516171819202122232425 |
- made apply cleanly based on
- commit 93e063ee374b6a75729df9e7201fb511e47e259d
- Author: Christos Zoulas <christos@zoulas.com>
- Date: Mon Jun 9 13:04:37 2014 +0000
- Add missing check offset test (Francisco Alonso, Jan Kaluza at RedHat)
- diff --git a/src/cdf.c b/src/cdf.c
- index 0bfb31a..c258e82 100644
- --- a/src/cdf.c
- +++ b/src/cdf.c
- @@ -802,7 +802,11 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
- if (cdf_check_stream_offset(sst, h, e, 0, __LINE__) == -1)
- goto out;
- for (i = 0; i < sh.sh_properties; i++) {
- - size_t ofs = CDF_GETUINT32(p, (i << 1) + 1);
- + size_t tail = (i << 1) + 1;
- + if (cdf_check_stream_offset(sst, h, p, tail * sizeof(uint32_t),
- + __LINE__) == -1)
- + goto out;
- + size_t ofs = CDF_GETUINT32(p, tail);
- q = (const uint8_t *)(const void *)
- ((const char *)(const void *)p + ofs
- - 2 * sizeof(uint32_t));
|
