From: Sven Eckelmann <sven.eckelmann@openmesh.com>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Sven Eckelmann <sven.eckelmann@openmesh.com>
Subject: [B.A.T.M.A.N.] [PATCH 01/10] batctl: Print dummy value when localtime failed
Date: Thu, 23 Nov 2017 15:04:35 +0100 [thread overview]
Message-ID: <20171123140444.17119-2-sven.eckelmann@openmesh.com> (raw)
In-Reply-To: <20171123140444.17119-1-sven.eckelmann@openmesh.com>
localtime can return NULL when the local time could not be calculated.
Accessing this NULL pointer is not allowed.
Fixes: 05f27bfcd302 ("add arp packets , change output")
Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
---
tcpdump.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tcpdump.c b/tcpdump.c
index 4ede76b..5eb99cf 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -104,7 +104,11 @@ static int print_time(void)
gettimeofday(&tv, NULL);
tm = localtime(&tv.tv_sec);
- printf("%02d:%02d:%02d.%06ld ", tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec);
+ if (tm)
+ printf("%02d:%02d:%02d.%06ld ", tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec);
+ else
+ printf("00:00:00.000000 ");
+
return 1;
}
--
2.11.0
next prev parent reply other threads:[~2017-11-23 14:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-23 14:04 [B.A.T.M.A.N.] [PATCH 00/10] batctl: Fixes and minor cleanup Sven Eckelmann
2017-11-23 14:04 ` Sven Eckelmann [this message]
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 02/10] batctl: Handle failure during hash_iterator allocation Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 03/10] batctl: Handle allocation error for path_buff Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 04/10] batctl: Handle nlmsg_alloc errors Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 05/10] batctl: Handle nl_socket_alloc errors Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 06/10] batctl: Handle nl_cb_alloc errors Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 07/10] batctl: Free nl_sock on genl_ctrl_resolve error Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 08/10] batctl: Free nl_sock when if_nametoindex failed Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 09/10] batctl: tcpdump: Fix types for for TT v1 Sven Eckelmann
2017-11-23 14:04 ` [B.A.T.M.A.N.] [PATCH 10/10] batctl: Simplify concatenation of pathnames Sven Eckelmann
2017-12-01 11:19 ` [B.A.T.M.A.N.] [PATCH 00/10] batctl: Fixes and minor cleanup Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171123140444.17119-2-sven.eckelmann@openmesh.com \
--to=sven.eckelmann@openmesh.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox