From 8e0575ca9b0a711350dfebd71bfae9c000a7f7f9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 30 Jan 2013 15:25:29 +0100
Subject: archive/zzip: fix memory leak

---
 src/archive/ZzipArchivePlugin.cxx | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'src/archive')

diff --git a/src/archive/ZzipArchivePlugin.cxx b/src/archive/ZzipArchivePlugin.cxx
index ba001bdd..38cb4e92 100644
--- a/src/archive/ZzipArchivePlugin.cxx
+++ b/src/archive/ZzipArchivePlugin.cxx
@@ -39,18 +39,18 @@ class ZzipArchiveFile : public ArchiveFile {
 public:
 	RefCount ref;
 
-	ZZIP_DIR *dir;
+	ZZIP_DIR *const dir;
 
-	ZzipArchiveFile():ArchiveFile(zzip_archive_plugin) {}
+	ZzipArchiveFile(ZZIP_DIR *_dir)
+		:ArchiveFile(zzip_archive_plugin), dir(_dir) {}
 
-	void Unref() {
-		if (!ref.Decrement())
-			return;
-
-		//close archive
-		zzip_dir_close (dir);
+	~ZzipArchiveFile() {
+		zzip_dir_close(dir);
+	}
 
-		delete this;
+	void Unref() {
+		if (ref.Decrement())
+			delete this;
 	}
 
 	void Visit(ArchiveVisitor &visitor);
@@ -69,17 +69,14 @@ zzip_quark(void)
 static ArchiveFile *
 zzip_archive_open(const char *pathname, GError **error_r)
 {
-	ZzipArchiveFile *context = new ZzipArchiveFile();
-
-	// open archive
-	context->dir = zzip_dir_open(pathname, NULL);
-	if (context->dir  == NULL) {
+	ZZIP_DIR *dir = zzip_dir_open(pathname, NULL);
+	if (dir == nullptr) {
 		g_set_error(error_r, zzip_quark(), 0,
 			    "Failed to open ZIP file %s", pathname);
 		return NULL;
 	}
 
-	return context;
+	return new ZzipArchiveFile(dir);
 }
 
 inline void
-- 
cgit v1.2.3