gpg: Use is_secured_filename before opening the file.

* g10/gpg.c (print_mds): Check by is_secured_filename, earlier.
* g10/tdbdump.c (import_ownertrust): Likewise.

--

GnuPG-bug-id: 6508
Signed-off-by: NIIBE Yutaka <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/g10/gpg.c b/g10/gpg.c
index d836ff072..23bf8d971 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -5622,13 +5622,13 @@ print_mds( const char *fname, int algo )
     }
   else
     {
-      fp = es_fopen (fname, "rb" );
-      if (fp && is_secured_file (es_fileno (fp)))
+      if (is_secured_filename (fname))
         {
-          es_fclose (fp);
           fp = NULL;
           gpg_err_set_errno (EPERM);
         }
+      else
+        fp = es_fopen (fname, "rb" );
     }
   if (!fp)
     {