security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

gpg: Fix wrong use of FD2INT with iobuf_fdopen_nc.

Browse Source 
* g10/decrypt.c (decrypt_message_fd): Use INPUT_FD directly.
* g10/encrypt.c (encrypt_crypt): Use FILEFD directly.

--

Before 8402815d, original code was with iobuf_open_fd_or_name, which
used gnupg_fd_t for the file descriptor (FD2INT was relevant at that
time).  After the change, because it's not gnupg_fd_t but int, use of
FD2INT is irrelevant.

Fixes-commit: 8402815d8e0e04a44362968f88b3d484d2395402
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-10-07 11:16:55 +09:00
parent 7ccd489aa2
commit d68a803c47
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
g10/decrypt.c
View File

@ -120,7 +120,7 @@ decrypt_message_fd (ctrl_t ctrl, int input_fd, int output_fd)
pfx = new_progress_context (); pfx = new_progress_context ();
/* Open the message file. */ /* Open the message file. */
fp = iobuf_fdopen_nc (FD2INT(input_fd), "rb"); fp = iobuf_fdopen_nc (input_fd, "rb");
if (fp && is_secured_file (iobuf_get_fd (fp))) if (fp && is_secured_file (iobuf_get_fd (fp)))
{ {
iobuf_close (fp); iobuf_close (fp);

4
g10/encrypt.c
View File

@ -829,10 +829,10 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
gpg_err_set_errno (ENOSYS); gpg_err_set_errno (ENOSYS);
} }
#else #else
if (filefd == GNUPG_INVALID_FD) if (filefd == -1)
inp = iobuf_open (filename); inp = iobuf_open (filename);
else else
inp = iobuf_fdopen_nc (FD2INT(filefd), "rb"); inp = iobuf_fdopen_nc (filefd, "rb");
#endif #endif
if (inp) if (inp)
iobuf_ioctl (inp, IOBUF_IOCTL_NO_CACHE, 1, NULL); iobuf_ioctl (inp, IOBUF_IOCTL_NO_CACHE, 1, NULL);