From a4b303038363185f60dfef7023cb02715a9a4315 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Sun, 28 May 2006 08:18:38 +0000 Subject: [lib] vty_log shouldn't crash if called when vty isn't initiliased 2006-05-28 Paul Jakma * vty.c: (vty_log/vty_log_fixed) dont crash if called when vty hasn't been initiliased. --- lib/ChangeLog | 2 ++ lib/vty.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/lib/ChangeLog b/lib/ChangeLog index 08131b03..90ddd07e 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -5,6 +5,8 @@ Add UINT*_MAX defines for older platforms lacking these (FBSD 4) * memory.c: malloc.h is deprecated in favour of stdlib.h, however we still need it on GNU Libc for mallinfo(). + * vty.c: (vty_log/vty_log_fixed) dont crash if called when vty + hasn't been initiliased. 2006-05-21 Andrew J. Schorr diff --git a/lib/vty.c b/lib/vty.c index 7696915a..b037c70c 100644 --- a/lib/vty.c +++ b/lib/vty.c @@ -2404,6 +2404,9 @@ vty_log (const char *level, const char *proto_str, { unsigned int i; struct vty *vty; + + if (!vtyvec) + return; for (i = 0; i < vector_active (vtyvec); i++) if ((vty = vector_slot (vtyvec, i)) != NULL) @@ -2423,6 +2426,10 @@ vty_log_fixed (const char *buf, size_t len) unsigned int i; struct iovec iov[2]; + /* vty may not have been initialised */ + if (!vtyvec) + return; + iov[0].iov_base = (void *)buf; iov[0].iov_len = len; iov[1].iov_base = (void *)"\r\n"; -- cgit v1.2.1