|
 |
0f0231 |
From 48676b9f1aac63f8a30ed8061b6e719929b82c98 Mon Sep 17 00:00:00 2001
|
|
|
0f0231 |
From: Ming-Hung Tsai <mtsai@redhat.com>
|
|
|
0f0231 |
Date: Wed, 28 Apr 2021 10:34:16 +0800
|
|
|
0f0231 |
Subject: [PATCH 01/10] [all] Fix resource leaks
|
|
|
0f0231 |
|
|
|
0f0231 |
---
|
|
|
0f0231 |
base/file_utils.cc | 4 +++-
|
|
|
0f0231 |
thin-provisioning/cache_stream.cc | 2 +-
|
|
|
0f0231 |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
0f0231 |
|
|
|
0f0231 |
diff --git a/base/file_utils.cc b/base/file_utils.cc
|
|
|
0f0231 |
index e4f3722..8253660 100644
|
|
|
0f0231 |
--- a/base/file_utils.cc
|
|
|
0f0231 |
+++ b/base/file_utils.cc
|
|
|
0f0231 |
@@ -155,8 +155,10 @@ file_utils::zero_superblock(std::string const &path)
|
|
|
0f0231 |
throw runtime_error("out of memory");
|
|
|
0f0231 |
|
|
|
0f0231 |
memset(buffer, 0, SUPERBLOCK_SIZE);
|
|
|
0f0231 |
- if (::write(fd.fd_, buffer, SUPERBLOCK_SIZE) != SUPERBLOCK_SIZE)
|
|
|
0f0231 |
+ if (::write(fd.fd_, buffer, SUPERBLOCK_SIZE) != SUPERBLOCK_SIZE) {
|
|
|
0f0231 |
+ free(buffer);
|
|
|
0f0231 |
throw runtime_error("couldn't zero superblock");
|
|
|
0f0231 |
+ }
|
|
|
0f0231 |
}
|
|
|
0f0231 |
|
|
|
0f0231 |
//----------------------------------------------------------------
|
|
|
0f0231 |
diff --git a/thin-provisioning/cache_stream.cc b/thin-provisioning/cache_stream.cc
|
|
|
0f0231 |
index 002b6ba..73b01b4 100644
|
|
|
0f0231 |
--- a/thin-provisioning/cache_stream.cc
|
|
|
0f0231 |
+++ b/thin-provisioning/cache_stream.cc
|
|
|
0f0231 |
@@ -62,7 +62,7 @@ chunk const &
|
|
|
0f0231 |
cache_stream::get()
|
|
|
0f0231 |
{
|
|
|
0f0231 |
chunk_wrapper *w = new chunk_wrapper(*this);
|
|
|
0f0231 |
- return w->c_;
|
|
|
0f0231 |
+ return w->c_; // wrapper will get freed by the put method
|
|
|
0f0231 |
}
|
|
|
0f0231 |
|
|
|
0f0231 |
void
|
|
|
0f0231 |
--
|
|
|
0f0231 |
1.8.3.1
|
|
|
0f0231 |
|