Remove check for za == NULL (which would segfault while setting the error). --HG-- branch : HEAD
diff --git a/lib/zip_source_crc.c b/lib/zip_source_crc.c index 7ffbfea..59e8a19 100644 --- a/lib/zip_source_crc.c +++ b/lib/zip_source_crc.c
@@ -56,7 +56,7 @@ { struct crc *ctx; - if (za == NULL || src == NULL) { + if (src == NULL) { _zip_error_set(&za->error, ZIP_ER_INVAL, 0); return NULL; }
diff --git a/lib/zip_source_deflate.c b/lib/zip_source_deflate.c index 0da1940..ca3db41 100644 --- a/lib/zip_source_deflate.c +++ b/lib/zip_source_deflate.c
@@ -67,7 +67,7 @@ struct deflate *ctx; struct zip_source *s2; - if (za == NULL || src == NULL || cm != ZIP_CM_DEFLATE) { + if (src == NULL || cm != ZIP_CM_DEFLATE) { _zip_error_set(&za->error, ZIP_ER_INVAL, 0); return NULL; }
diff --git a/lib/zip_source_pkware.c b/lib/zip_source_pkware.c index c7736a9..c1f3e42 100644 --- a/lib/zip_source_pkware.c +++ b/lib/zip_source_pkware.c
@@ -71,8 +71,7 @@ struct trad_pkware *ctx; struct zip_source *s2; - if (za == NULL || password == NULL || src == NULL - || em != ZIP_EM_TRAD_PKWARE) { + if (password == NULL || src == NULL || em != ZIP_EM_TRAD_PKWARE) { _zip_error_set(&za->error, ZIP_ER_INVAL, 0); return NULL; }