summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2018-12-19 18:59:49 +0000
committerJohn Levon <john.levon@joyent.com>2019-02-21 11:04:04 +0000
commit7957da45b8e66b8cd6e917ac6bd8965817d7ef06 (patch)
tree66b9438d6bf3acef8ae6a5925f122c026448e933
parenta8b4e7c71a6c1ef07e77c48dbb92fcdc8624266d (diff)
downloadillumos-joyent-7957da45b8e66b8cd6e917ac6bd8965817d7ef06.tar.gz
10144 BZ2_bzDecompressReset() gets NULL check wrong
Reviewed by: Andy Stormont <astormont@racktopsystems.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Gergő Doma <domag02@gmail.com> Approved by: Robert Mustacchi <rm@joyent.com>
-rw-r--r--usr/src/common/bzip2/bzlib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/common/bzip2/bzlib.c b/usr/src/common/bzip2/bzlib.c
index 22e2d8826e..de5c009de8 100644
--- a/usr/src/common/bzip2/bzlib.c
+++ b/usr/src/common/bzip2/bzlib.c
@@ -673,12 +673,13 @@ int BZ_API(BZ2_bzDecompressInit)
*/
int BZ_API(BZ2_bzDecompressReset) ( bz_stream* strm )
{
- DState* s = strm->state;
+ DState* s;
if (!bz_config_ok()) return BZ_CONFIG_ERROR;
if (strm == NULL) return BZ_PARAM_ERROR;
+ s = strm->state;
s->strm = strm;
s->state = BZ_X_MAGIC_1;