aboutsummaryrefslogtreecommitdiff
path: root/libbacktrace
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2017-10-06 13:37:20 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2017-10-06 13:37:20 +0000
commitff130bf4cf0599fd5f0e8ebc9a95beaa4589ace7 (patch)
treed9785a84ea32807eb6622002b93674895e97b388 /libbacktrace
parent5343cfd92765e1717ddc0b719da4835d0b47acc1 (diff)
* ztest.c (test_large): Pass unsigned long *, not size_t *, to
zlib uncompress function. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253491 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/ChangeLog5
-rw-r--r--libbacktrace/ztest.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 7aadc7353ef..5540530ef4f 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-06 Ian Lance Taylor <iant@golang.org>
+
+ * ztest.c (test_large): Pass unsigned long *, not size_t *, to
+ zlib uncompress function.
+
2017-10-05 Ian Lance Taylor <iant@golang.org>
* elf.c (elf_zlib_fetch): Change pval argument to uint64_t *.
diff --git a/libbacktrace/ztest.c b/libbacktrace/ztest.c
index 7226d6a0a36..9ce4b21fcd1 100644
--- a/libbacktrace/ztest.c
+++ b/libbacktrace/ztest.c
@@ -369,6 +369,8 @@ test_large (struct backtrace_state *state)
for (i = 0; i < trials; ++i)
{
+ unsigned long uncompress_sizearg;
+
cid = ZLIB_CLOCK_GETTIME_ARG;
if (clock_gettime (cid, &ts1) < 0)
{
@@ -406,7 +408,8 @@ test_large (struct backtrace_state *state)
return;
}
- r = uncompress (uncompressed_buf, &uncompressed_bufsize,
+ uncompress_sizearg = uncompressed_bufsize;
+ r = uncompress (uncompressed_buf, &uncompress_sizearg,
compressed_buf + 12, compressed_bufsize - 12);
if (clock_gettime (cid, &ts2) < 0)