aboutsummaryrefslogtreecommitdiff
path: root/deflate.c
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:20:29 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:20:29 -0700
commit14763ac7c6c03bca62c39e35c03cf5bfc7728802 (patch)
treef1055d11ef7b282b698ce7c40e1a9c061413cbdf /deflate.c
parentc34c1fcbb19852ca35216ad66276f4f86af3fc22 (diff)
downloadzlib-14763ac7c6c03bca62c39e35c03cf5bfc7728802.tar.gz
zlib-14763ac7c6c03bca62c39e35c03cf5bfc7728802.tar.bz2
zlib-14763ac7c6c03bca62c39e35c03cf5bfc7728802.zip
zlib 1.1.3v1.1.3
Diffstat (limited to 'deflate.c')
-rw-r--r--deflate.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/deflate.c b/deflate.c
index 490813f..25d5818 100644
--- a/deflate.c
+++ b/deflate.c
@@ -52,7 +52,7 @@
52#include "deflate.h" 52#include "deflate.h"
53 53
54const char deflate_copyright[] = 54const char deflate_copyright[] =
55 " deflate 1.1.2 Copyright 1995-1998 Jean-loup Gailly "; 55 " deflate 1.1.3 Copyright 1995-1998 Jean-loup Gailly ";
56/* 56/*
57 If you use the zlib library in a product, an acknowledgment is welcome 57 If you use the zlib library in a product, an acknowledgment is welcome
58 in the documentation of your product. If for some reason you cannot 58 in the documentation of your product. If for some reason you cannot
@@ -608,11 +608,13 @@ int ZEXPORT deflateCopy (dest, source)
608 deflate_state *ss; 608 deflate_state *ss;
609 ushf *overlay; 609 ushf *overlay;
610 610
611 ss = source->state;
612 611
613 if (source == Z_NULL || dest == Z_NULL || ss == Z_NULL) { 612 if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
614 return Z_STREAM_ERROR; 613 return Z_STREAM_ERROR;
615 } 614 }
615
616 ss = source->state;
617
616 *dest = *source; 618 *dest = *source;
617 619
618 ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); 620 ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));