|
 |
cd63e5 |
From 35ae4edd9a6abef11fbdbfef5e717ba6eee6f8ee Mon Sep 17 00:00:00 2001
|
|
|
cd63e5 |
From: Patrick Uiterwijk <puiterwijk@redhat.com>
|
|
|
cd63e5 |
Date: Wed, 28 Sep 2016 12:09:07 +0000
|
|
|
cd63e5 |
Subject: [PATCH] Close BZ2 compressed files on cr_close
|
|
|
cd63e5 |
|
|
|
cd63e5 |
Per bzip2 documentation: "BZ2_bzReadClose does not call fclose on the underlying file
|
|
|
cd63e5 |
handle, so you should do that yourself if appropriate.".
|
|
|
cd63e5 |
This patch adds a INNERFILE element to CR_FILE to keep track of the FILE object so we
|
|
|
cd63e5 |
can properly close the file on cr_close.
|
|
|
cd63e5 |
|
|
|
cd63e5 |
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
|
|
|
cd63e5 |
---
|
|
|
cd63e5 |
src/compression_wrapper.c | 6 ++++++
|
|
|
cd63e5 |
src/compression_wrapper.h | 1 +
|
|
|
cd63e5 |
2 files changed, 7 insertions(+)
|
|
|
cd63e5 |
|
|
|
cd63e5 |
diff --git a/src/compression_wrapper.c b/src/compression_wrapper.c
|
|
|
cd63e5 |
index aacaf90..adc2f39 100644
|
|
|
cd63e5 |
--- a/src/compression_wrapper.c
|
|
|
cd63e5 |
+++ b/src/compression_wrapper.c
|
|
|
cd63e5 |
@@ -347,6 +347,7 @@ cr_sopen(const char *filename,
|
|
|
cd63e5 |
file = g_malloc0(sizeof(CR_FILE));
|
|
|
cd63e5 |
file->mode = mode;
|
|
|
cd63e5 |
file->type = type;
|
|
|
cd63e5 |
+ file->INNERFILE = NULL;
|
|
|
cd63e5 |
|
|
|
cd63e5 |
switch (type) {
|
|
|
cd63e5 |
|
|
|
cd63e5 |
@@ -380,6 +381,7 @@ cr_sopen(const char *filename,
|
|
|
cd63e5 |
|
|
|
cd63e5 |
case (CR_CW_BZ2_COMPRESSION): { // ------------------------------------
|
|
|
cd63e5 |
FILE *f = fopen(filename, mode_str);
|
|
|
cd63e5 |
+ file->INNERFILE = f;
|
|
|
cd63e5 |
int bzerror;
|
|
|
cd63e5 |
|
|
|
cd63e5 |
if (!f) {
|
|
|
cd63e5 |
@@ -405,6 +407,8 @@ cr_sopen(const char *filename,
|
|
|
cd63e5 |
if (bzerror != BZ_OK) {
|
|
|
cd63e5 |
const char *err_msg;
|
|
|
cd63e5 |
|
|
|
cd63e5 |
+ fclose(f);
|
|
|
cd63e5 |
+
|
|
|
cd63e5 |
switch (bzerror) {
|
|
|
cd63e5 |
case BZ_CONFIG_ERROR:
|
|
|
cd63e5 |
err_msg = "library has been mis-compiled";
|
|
|
cd63e5 |
@@ -642,6 +646,8 @@ cr_close(CR_FILE *cr_file, GError **err)
|
|
|
cd63e5 |
BZ2_bzWriteClose(&rc, (BZFILE *) cr_file->FILE,
|
|
|
cd63e5 |
BZ2_SKIP_FFLUSH, NULL, NULL);
|
|
|
cd63e5 |
|
|
|
cd63e5 |
+ fclose(cr_file->INNERFILE);
|
|
|
cd63e5 |
+
|
|
|
cd63e5 |
if (rc == BZ_OK) {
|
|
|
cd63e5 |
ret = CRE_OK;
|
|
|
cd63e5 |
} else {
|
|
|
cd63e5 |
diff --git a/src/compression_wrapper.h b/src/compression_wrapper.h
|
|
|
cd63e5 |
index 910fd45..65022d9 100644
|
|
|
cd63e5 |
--- a/src/compression_wrapper.h
|
|
|
cd63e5 |
+++ b/src/compression_wrapper.h
|
|
|
cd63e5 |
@@ -79,6 +79,7 @@ void cr_contentstat_free(cr_ContentStat *cstat, GError **err);
|
|
|
cd63e5 |
typedef struct {
|
|
|
cd63e5 |
cr_CompressionType type; /*!< Type of compression */
|
|
|
cd63e5 |
void *FILE; /*!< Pointer to gzFile, BZFILE, ... */
|
|
|
cd63e5 |
+ void *INNERFILE; /*!< Pointer to underlying FILE */
|
|
|
cd63e5 |
cr_OpenMode mode; /*!< Mode */
|
|
|
cd63e5 |
cr_ContentStat *stat; /*!< Content stats */
|
|
|
cd63e5 |
cr_ChecksumCtx *checksum_ctx; /*!< Checksum contenxt */
|