diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 13:55:55 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 13:56:28 +0100 |
| commit | 0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (patch) | |
| tree | eee062f34219e5c5d3f3e61caa5d3c39a5185794 /zlib/examples/zran.c | |
| parent | 3893ee9f6b12465239b63d08763bd9ba0bd329e5 (diff) | |
| parent | 4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff) | |
| download | vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.gz vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.bz2 vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated zlib to 1.2.8
Conflicts:
zlib/win32/zlib.def
Diffstat (limited to 'zlib/examples/zran.c')
| -rw-r--r-- | zlib/examples/zran.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/zlib/examples/zran.c b/zlib/examples/zran.c index 617a13086..278f9ad07 100644 --- a/zlib/examples/zran.c +++ b/zlib/examples/zran.c @@ -1,7 +1,12 @@ /* zran.c -- example of zlib/gzip stream indexing and random access - * Copyright (C) 2005 Mark Adler + * Copyright (C) 2005, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h - Version 1.0 29 May 2005 Mark Adler */ + Version 1.1 29 Sep 2012 Mark Adler */ + +/* Version History: + 1.0 29 May 2005 First version + 1.1 29 Sep 2012 Fix memory reallocation error + */ /* Illustrate the use of Z_BLOCK, inflatePrime(), and inflateSetDictionary() for random access of a compressed file. A file containing a zlib or gzip @@ -221,7 +226,7 @@ local int build_index(FILE *in, off_t span, struct access **built) /* clean up and return index (release unused entries in list) */ (void)inflateEnd(&strm); - index = realloc(index, sizeof(struct point) * index->have); + index->list = realloc(index->list, sizeof(struct point) * index->have); index->size = index->have; *built = index; return index->size; |