Module Name: src
Committed By: christos
Date: Sun Jun 24 15:36:31 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: pfilter.c
Log Message:
Since now we are called from cleanup_exit() make sure that we have a state
to work with. Found by ASAN.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/pfilter.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/pfilter.c
diff -u src/crypto/external/bsd/openssh/dist/pfilter.c:1.5 src/crypto/external/bsd/openssh/dist/pfilter.c:1.6
--- src/crypto/external/bsd/openssh/dist/pfilter.c:1.5 Fri Apr 6 14:59:00 2018
+++ src/crypto/external/bsd/openssh/dist/pfilter.c Sun Jun 24 11:36:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pfilter.c,v 1.5 2018/04/06 18:59:00 christos Exp $ */
+/* $NetBSD: pfilter.c,v 1.6 2018/06/24 15:36:31 christos Exp $ */
#include "namespace.h"
#include "includes.h"
#include "ssh.h"
@@ -12,7 +12,7 @@ static struct blacklist *blstate;
#endif
#include "includes.h"
-__RCSID("$NetBSD: pfilter.c,v 1.5 2018/04/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: pfilter.c,v 1.6 2018/06/24 15:36:31 christos Exp $");
void
pfilter_init()
@@ -27,6 +27,8 @@ pfilter_notify(int a)
{
#ifndef SMALL
int fd;
+ if (active_state == NULL)
+ return;
if (blstate == NULL)
pfilter_init();
if (blstate == NULL)
