|
 |
003ee8 |
From c01a30a6821b243cb0f497b73bb5a7b7465b6aca Mon Sep 17 00:00:00 2001
|
|
|
003ee8 |
From: Amarnath Valluri <amarnath.valluri@intel.com>
|
|
|
003ee8 |
Date: Tue, 4 Aug 2015 13:04:45 +0300
|
|
|
003ee8 |
Subject: [PATCH 17/18] libparted: Fix possible memory leaks
|
|
|
003ee8 |
|
|
|
003ee8 |
* libparted/fs/r/fat/resize.c(fat_convert_directory): Possible leak
|
|
|
003ee8 |
of sub_old_dir_trav or sub_new_dir_trav in error case.
|
|
|
003ee8 |
* libparted/fs/r/fat/resize.c(fat_construct_converted_tree ): Possible
|
|
|
003ee8 |
leak of new_trav_info or old_trav_info in error case.
|
|
|
003ee8 |
|
|
|
003ee8 |
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
|
|
|
003ee8 |
Signed-off-by: Brian C. Lane <bcl@redhat.com>
|
|
|
003ee8 |
(cherry picked from commit 4886bad13dd011ff56e1c46ff29e8067778c16fd)
|
|
|
003ee8 |
---
|
|
|
003ee8 |
libparted/fs/r/fat/resize.c | 11 +++++++++--
|
|
|
003ee8 |
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
003ee8 |
|
|
|
003ee8 |
diff --git a/libparted/fs/r/fat/resize.c b/libparted/fs/r/fat/resize.c
|
|
|
003ee8 |
index 919acf0..b512576 100644
|
|
|
003ee8 |
--- a/libparted/fs/r/fat/resize.c
|
|
|
003ee8 |
+++ b/libparted/fs/r/fat/resize.c
|
|
|
003ee8 |
@@ -177,10 +177,13 @@ fat_convert_directory (FatOpContext* ctx, FatTraverseInfo* old_trav,
|
|
|
003ee8 |
&& old_dir_entry->name [0] != '.') {
|
|
|
003ee8 |
sub_old_dir_trav
|
|
|
003ee8 |
= fat_traverse_directory (old_trav, old_dir_entry);
|
|
|
003ee8 |
+ if (!sub_old_dir_trav) return 0;
|
|
|
003ee8 |
sub_new_dir_trav
|
|
|
003ee8 |
= fat_traverse_directory (new_trav, new_dir_entry);
|
|
|
003ee8 |
- if (!sub_old_dir_trav || !sub_new_dir_trav)
|
|
|
003ee8 |
+ if (!sub_new_dir_trav) {
|
|
|
003ee8 |
+ fat_traverse_complete (sub_old_dir_trav);
|
|
|
003ee8 |
return 0;
|
|
|
003ee8 |
+ }
|
|
|
003ee8 |
|
|
|
003ee8 |
if (!fat_convert_directory (ctx, sub_old_dir_trav,
|
|
|
003ee8 |
sub_new_dir_trav))
|
|
|
003ee8 |
@@ -315,17 +318,21 @@ fat_construct_converted_tree (FatOpContext* ctx)
|
|
|
003ee8 |
if (new_fs_info->fat_type == FAT_TYPE_FAT32) {
|
|
|
003ee8 |
new_trav_info = fat_traverse_begin (ctx->new_fs,
|
|
|
003ee8 |
new_fs_info->root_cluster, "\\");
|
|
|
003ee8 |
+ if (!new_trav_info) return 0;
|
|
|
003ee8 |
old_trav_info = fat_traverse_begin (ctx->old_fs, FAT_ROOT,
|
|
|
003ee8 |
"\\");
|
|
|
003ee8 |
} else {
|
|
|
003ee8 |
fat_clear_root_dir (ctx->new_fs);
|
|
|
003ee8 |
new_trav_info = fat_traverse_begin (ctx->new_fs, FAT_ROOT,
|
|
|
003ee8 |
"\\");
|
|
|
003ee8 |
+ if (!new_trav_info) return 0;
|
|
|
003ee8 |
old_trav_info = fat_traverse_begin (ctx->old_fs,
|
|
|
003ee8 |
old_fs_info->root_cluster, "\\");
|
|
|
003ee8 |
}
|
|
|
003ee8 |
- if (!new_trav_info || !old_trav_info)
|
|
|
003ee8 |
+ if (!old_trav_info) {
|
|
|
003ee8 |
+ fat_traverse_complete (new_trav_info);
|
|
|
003ee8 |
return 0;
|
|
|
003ee8 |
+ }
|
|
|
003ee8 |
if (!fat_convert_directory (ctx, old_trav_info, new_trav_info))
|
|
|
003ee8 |
return 0;
|
|
|
003ee8 |
return 1;
|
|
|
003ee8 |
--
|
|
|
003ee8 |
2.4.3
|
|
|
003ee8 |
|