54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From 32c7b484da4e5546d28bc5d88866fa018a0df647 Mon Sep 17 00:00:00 2001
|
|
From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|
Date: Tue, 22 Sep 2020 15:29:00 +0800
|
|
Subject: [PATCH 1/2] iSulad: fix memory leak
|
|
|
|
Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
|
|
---
|
|
src/daemon/modules/image/oci/storage/storage.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/daemon/modules/image/oci/storage/storage.c b/src/daemon/modules/image/oci/storage/storage.c
|
|
index 8ad96d60..249aa1b3 100644
|
|
--- a/src/daemon/modules/image/oci/storage/storage.c
|
|
+++ b/src/daemon/modules/image/oci/storage/storage.c
|
|
@@ -103,15 +103,14 @@ static int fill_read_wrapper(const char *layer_data_path, struct io_read_wrapper
|
|
reader_tmp = util_common_calloc_s(sizeof(struct io_read_wrapper));
|
|
if (reader_tmp == NULL) {
|
|
ERROR("Memory out");
|
|
- ret = -1;
|
|
- goto out;
|
|
+ return -1;
|
|
}
|
|
|
|
fd_ptr = util_common_calloc_s(sizeof(int));
|
|
if (fd_ptr == NULL) {
|
|
ERROR("Memory out");
|
|
ret = -1;
|
|
- goto out;
|
|
+ goto err_out;
|
|
}
|
|
|
|
*fd_ptr = util_open(layer_data_path, O_RDONLY, 0);
|
|
@@ -125,13 +124,14 @@ static int fill_read_wrapper(const char *layer_data_path, struct io_read_wrapper
|
|
reader_tmp->read = layer_archive_io_read;
|
|
reader_tmp->close = layer_archive_io_close;
|
|
*reader = reader_tmp;
|
|
-
|
|
- goto out;
|
|
+
|
|
+ fd_ptr = NULL;
|
|
+ reader_tmp = NULL;
|
|
|
|
err_out:
|
|
free(fd_ptr);
|
|
free(reader_tmp);
|
|
-out:
|
|
+
|
|
return ret;
|
|
}
|
|
|
|
--
|
|
2.25.1
|
|
|