diff options
author | peter <peter@FreeBSD.org> | 1998-06-20 16:28:04 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1998-06-20 16:28:04 +0000 |
commit | 30f088ad7bc38164fba1bda3e8d767e2ab1959de (patch) | |
tree | f09607f67b8a4413266b0305a3f43edfc161f554 /sys/net/zlib.c | |
parent | cbd53d5292744ee755bbcd55babd276ab31a50d1 (diff) | |
download | FreeBSD-src-30f088ad7bc38164fba1bda3e8d767e2ab1959de.zip FreeBSD-src-30f088ad7bc38164fba1bda3e8d767e2ab1959de.tar.gz |
Merge ppp changes from 2.3.3 -> 2.3.5. I have spotted some more
problems, which I'll have a go at shortly.
Diffstat (limited to 'sys/net/zlib.c')
-rw-r--r-- | sys/net/zlib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/zlib.c b/sys/net/zlib.c index 1016253..f16092d 100644 --- a/sys/net/zlib.c +++ b/sys/net/zlib.c @@ -10,7 +10,7 @@ * - added inflateIncomp and deflateOutputPending * - allow strm->next_out to be NULL, meaning discard the output * - * $Id: zlib.c,v 1.5 1998/02/09 06:10:02 eivind Exp $ + * $Id: zlib.c,v 1.6 1998/03/21 20:56:15 peter Exp $ */ /* @@ -1151,12 +1151,12 @@ int deflateCopy (dest, source) return Z_STREAM_ERROR; ss = (deflate_state *) source->state; - *dest = *source; + zmemcpy(dest, source, sizeof(*dest)); ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); if (ds == Z_NULL) return Z_MEM_ERROR; dest->state = (struct internal_state FAR *) ds; - *ds = *ss; + zmemcpy(ds, ss, sizeof(*ds)); ds->strm = dest; ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); |