From 9962f24cc458e7d7588d4d043339823067aa3b83 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 29 Nov 2007 08:32:54 +0100 Subject: Close a file descriptor leak when cp --preserve=context fails. * src/copy.c (copy_reg): Close dest_desc too, if getfscreatecon or fsetfilecon fail. --- ChangeLog | 6 ++++++ src/copy.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7326a4078..38401db1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-28 Paul Eggert + + Close a file descriptor leak when cp --preserve=context fails. + * src/copy.c (copy_reg): Close dest_desc too, if getfscreatecon + or fsetfilecon fail. + 2007-11-28 Jim Meyering * README: Document the known problem with gettext <= 0.17. diff --git a/src/copy.c b/src/copy.c index 4dec5166e..975890750 100644 --- a/src/copy.c +++ b/src/copy.c @@ -341,7 +341,7 @@ copy_reg (char const *src_name, char const *dst_name, if (x->require_preserve_context) { return_val = false; - goto close_src_desc; + goto close_src_and_dst_desc; } } @@ -356,7 +356,7 @@ copy_reg (char const *src_name, char const *dst_name, { return_val = false; freecon (con); - goto close_src_desc; + goto close_src_and_dst_desc; } } freecon(con); -- cgit v1.2.3-54-g00ecf