diff options
| author | John Thacker <johnthacker@gmail.com> | 2022-05-13 09:19:16 -0400 |
|---|---|---|
| committer | A Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2022-05-13 13:41:28 +0000 |
| commit | 1f1ee198f2d013f1580958ded143b6e150093324 (patch) | |
| tree | 262f6ea17f17704de282b1dbfb2451e47c3c18d6 /capture_opts.h | |
| parent | bebf7afa37bc49d8f58ec68c71459a005d5c3652 (diff) | |
merge: Don't write to stdout if tempdir is not set
If merge_files_common() is called with a non NULL value for out_filenamep,
that always indicates tempfile mode, even if the tempdir is not set.
A NULL value for the tempdir is handled by wtap_dump_open_tempfile,
which writes to the OS default temp directory.
Only write to stdout if both out_filename and out_filenamep are NULL.
Fixes a crash introduced by commit 1e0d117eb7ab1ce7f4ff8a4f
when selecting Merge from the GUI and the new temp_dir option is not set.
Diffstat (limited to 'capture_opts.h')
0 files changed, 0 insertions, 0 deletions