proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-17 20:09:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[lib] vty_log shouldn't crash if called when vty isn't initiliased

Browse Source 
2006-05-28 Paul Jakma <paul.jakma@sun.com>

	* vty.c: (vty_log/vty_log_fixed) dont crash if called when vty
	  hasn't been initiliased.
This commit is contained in:
Paul Jakma 2006-05-28 08:18:38 +00:00
parent d09552d0c7
commit a4b3030383
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ChangeLog
View File

@ -5,6 +5,8 @@
Add UINT*_MAX defines for older platforms lacking these (FBSD 4) Add UINT*_MAX defines for older platforms lacking these (FBSD 4)
* memory.c: malloc.h is deprecated in favour of stdlib.h, however * memory.c: malloc.h is deprecated in favour of stdlib.h, however
we still need it on GNU Libc for mallinfo(). 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> 2006-05-21 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

7
lib/vty.c
View File

@ -2404,6 +2404,9 @@ vty_log (const char *level, const char *proto_str,
{ {
unsigned int i; unsigned int i;
struct vty *vty; struct vty *vty;
if (!vtyvec)
return;
for (i = 0; i < vector_active (vtyvec); i++) for (i = 0; i < vector_active (vtyvec); i++)
if ((vty = vector_slot (vtyvec, i)) != NULL) if ((vty = vector_slot (vtyvec, i)) != NULL)
@ -2423,6 +2426,10 @@ vty_log_fixed (const char *buf, size_t len)
unsigned int i; unsigned int i;
struct iovec iov[2]; struct iovec iov[2];
/* vty may not have been initialised */
if (!vtyvec)
return;
iov[0].iov_base = (void *)buf; iov[0].iov_base = (void *)buf;
iov[0].iov_len = len; iov[0].iov_len = len;
iov[1].iov_base = (void *)"\r\n"; iov[1].iov_base = (void *)"\r\n";