summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2009-01-28 16:16:00 +1100
committerDamien Miller <djm@mindrot.org>2009-01-28 16:16:00 +1100
commit7375fe2c6d42e62b30a90e7a874f188c891061d5 (patch)
tree24592c2fdfd586f4ea8441945d66b883afabc9f2
parentb3f2c9fcaf082077ba42f86272011fe08ece3afa (diff)
- stevesk@cvs.openbsd.org 2008/12/10 03:55:20
[addrmatch.c] o cannot be NULL here but use xfree() to be consistent; ok djm@
-rw-r--r--ChangeLog5
-rw-r--r--addrmatch.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 482bd6be..012a6651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
- stevesk@cvs.openbsd.org 2008/12/09 22:37:33
[clientloop.c]
fix typo in error message
+ - stevesk@cvs.openbsd.org 2008/12/10 03:55:20
+ [addrmatch.c]
+ o cannot be NULL here but use xfree() to be consistent; ok djm@
20090107
- (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@@ -5026,5 +5029,5 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.5164 2009/01/28 05:15:30 djm Exp $
+$Id: ChangeLog,v 1.5165 2009/01/28 05:16:00 djm Exp $
diff --git a/addrmatch.c b/addrmatch.c
index f3c861a1..d39885b7 100644
--- a/addrmatch.c
+++ b/addrmatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: addrmatch.c,v 1.3 2008/06/10 23:06:19 djm Exp $ */
+/* $OpenBSD: addrmatch.c,v 1.4 2008/12/10 03:55:20 stevesk Exp $ */
/*
* Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org>
@@ -31,6 +31,7 @@
#include "match.h"
#include "log.h"
+#include "xmalloc.h"
struct xaddr {
sa_family_t af;
@@ -417,7 +418,7 @@ addr_match_list(const char *addr, const char *_list)
goto foundit;
}
}
- free(o);
+ xfree(o);
return ret;
}