aboutsummaryrefslogtreecommitdiffstats
path: root/extcap.c
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2017-12-22 17:21:25 +0100
committerMichael Mann <mmann78@netscape.net>2017-12-23 01:31:31 +0000
commit271d6c14ef598e18e335a932d466265376ac6c6f (patch)
tree747941b22738f18161ba1fb970e784b3a6134aed /extcap.c
parent8a83e4d9ea7f75030e41396ce66abbec4c6e8be4 (diff)
extcap: null terminate the string that will be used in strlen (CID 1364684).
Change-Id: Ie4c7eed2ac24327292af9a45ffc7e4630338a6b4 Reviewed-on: https://code.wireshark.org/review/24948 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'extcap.c')
-rw-r--r--extcap.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/extcap.c b/extcap.c
index 179a2cd6a7..d0d527ffb1 100644
--- a/extcap.c
+++ b/extcap.c
@@ -1070,10 +1070,16 @@ void extcap_if_cleanup(capture_options *capture_opts, gchar **errormsg)
#ifdef _WIN32
win32_readfrompipe((HANDLE)_get_osfhandle(userdata->extcap_stderr_rd), STDERR_BUFFER_SIZE, buffer);
#else
- if (read(userdata->extcap_stderr_rd, buffer, sizeof(gchar) * STDERR_BUFFER_SIZE) <= 0)
+ ssize_t buffer_len;
+ buffer_len = read(userdata->extcap_stderr_rd, buffer, sizeof(gchar) * STDERR_BUFFER_SIZE);
+ if (buffer_len <= 0)
{
buffer[0] = '\0';
}
+ else
+ {
+ buffer[buffer_len] = '\0';
+ }
#endif
if (strlen(buffer) > 0)
{