diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-05 18:01:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-05 18:01:00 -0800 |
| commit | 141b6b83d7ca5bd32d55a0a7e08384084d081557 (patch) | |
| tree | 5c0aea567c793844ba1568c77b3eb3bea2e6fe81 /builtin-apply.c | |
| parent | cc91e1bd0537442339c4fd233b98a4b30e9dbe29 (diff) | |
| parent | 39c68542fc8d8477f2080c99efedb9dce975abc6 (diff) | |
| download | git-141b6b83d7ca5bd32d55a0a7e08384084d081557.tar.gz | |
Merge branch 'lt/maint-wrap-zlib' into maint
* lt/maint-wrap-zlib:
Wrap inflate and other zlib routines for better error reporting
Conflicts:
http-push.c
http-walker.c
sha1_file.c
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 3b6cd6dfae..b31007ba99 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -1253,8 +1253,9 @@ static char *inflate_it(const void *data, unsigned long size, stream.avail_in = size; stream.next_out = out = xmalloc(inflated_size); stream.avail_out = inflated_size; - inflateInit(&stream); - st = inflate(&stream, Z_FINISH); + git_inflate_init(&stream); + st = git_inflate(&stream, Z_FINISH); + git_inflate_end(&stream); if ((st != Z_STREAM_END) || stream.total_out != inflated_size) { free(out); return NULL; |