nalika / rpms / bash

Forked from rpms/bash 2 years ago
Clone
287226
There are missing calls of close() leading to resource leak (fd leak).
287226
Simple reproducer:
287226
. /
287226
and /proc/$$/fd contain one open fd for each above call
287226

287226
Signed-off-by: Roman Rakus <rrakus@redhat.com>
287226
---
287226
 builtins/evalfile.c | 3 +++
287226
 1 file changed, 3 insertions(+)
287226

287226
diff --git a/builtins/evalfile.c b/builtins/evalfile.c
287226
index 60f89d1..d30bd96 100644
287226
--- a/builtins/evalfile.c
287226
+++ b/builtins/evalfile.c
287226
@@ -133,11 +133,13 @@ file_error_and_exit:
287226
   if (S_ISDIR (finfo.st_mode))
287226
     {
287226
       (*errfunc) (_("%s: is a directory"), filename);
287226
+      close(fd);
287226
       return ((flags & FEVAL_BUILTIN) ? EXECUTION_FAILURE : -1);
287226
     }
287226
   else if ((flags & FEVAL_REGFILE) && S_ISREG (finfo.st_mode) == 0)
287226
     {
287226
       (*errfunc) (_("%s: not a regular file"), filename);
287226
+      close(fd);
287226
       return ((flags & FEVAL_BUILTIN) ? EXECUTION_FAILURE : -1);
287226
     }
287226
 
287226
@@ -146,6 +148,7 @@ file_error_and_exit:
287226
   if (file_size != finfo.st_size || file_size + 1 < file_size)
287226
     {
287226
       (*errfunc) (_("%s: file is too large"), filename);
287226
+      close(fd);
287226
       return ((flags & FEVAL_BUILTIN) ? EXECUTION_FAILURE : -1);
287226
     }      
287226
 
287226
-- 
287226
1.7.11.7
287226