diff options
| -rw-r--r-- | lib/ChangeLog | 2 | ||||
| -rw-r--r-- | lib/vty.c | 7 |
2 files changed, 9 insertions, 0 deletions
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 <ajschorr@alumni.princeton.edu> @@ -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"; |