debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli/restore: gzerror() after gzclose_r() is a use after free

Browse source 
Calling gzerror() (indirectly via gzerror_str()) after gzclose_r is a
use after free, according to zlib's manual.

amended by db: tidied commit message
This commit is contained in:
Olivier Taïbi 2020-04-14 19:36:27 +02:00 committed by David Bremner
parent e083987338
commit 8c718a8190
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
notmuch-restore.c
View file

@ -237,6 +237,7 @@ notmuch_restore_command (notmuch_config_t *config, int argc, char *argv[])
int opt_index; int opt_index;
int include = 0; int include = 0;
int input_format = DUMP_FORMAT_AUTO; int input_format = DUMP_FORMAT_AUTO;
int errnum;
if (notmuch_database_open (notmuch_config_get_database_path (config), if (notmuch_database_open (notmuch_config_get_database_path (config),
NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch)) NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch))
@ -448,11 +449,14 @@ notmuch_restore_command (notmuch_config_t *config, int argc, char *argv[])
if (notmuch) if (notmuch)
notmuch_database_destroy (notmuch); notmuch_database_destroy (notmuch);
if (input && gzclose_r (input)) { if (input) {
fprintf (stderr, "Error closing %s: %s\n", errnum = gzclose_r (input);
name_for_error, gzerror_str (input)); if (errnum) {
fprintf (stderr, "Error closing %s: %d\n",
name_for_error, errnum);
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
} }
}
return ret ? EXIT_FAILURE : EXIT_SUCCESS; return ret ? EXIT_FAILURE : EXIT_SUCCESS;
} }