summaryrefslogtreecommitdiff
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 482bd6bed..012a66514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
17 - stevesk@cvs.openbsd.org 2008/12/09 22:37:33 17 - stevesk@cvs.openbsd.org 2008/12/09 22:37:33
18 [clientloop.c] 18 [clientloop.c]
19 fix typo in error message 19 fix typo in error message
20 - stevesk@cvs.openbsd.org 2008/12/10 03:55:20
21 [addrmatch.c]
22 o cannot be NULL here but use xfree() to be consistent; ok djm@
20 23
2120090107 2420090107
22 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. 25 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@@ -5026,5 +5029,5 @@
5026 OpenServer 6 and add osr5bigcrypt support so when someone migrates 5029 OpenServer 6 and add osr5bigcrypt support so when someone migrates
5027 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 5030 passwords between UnixWare and OpenServer they will still work. OK dtucker@
5028 5031
5029$Id: ChangeLog,v 1.5164 2009/01/28 05:15:30 djm Exp $ 5032$Id: ChangeLog,v 1.5165 2009/01/28 05:16:00 djm Exp $
5030 5033
diff --git a/addrmatch.c b/addrmatch.c
index f3c861a1f..d39885b7b 100644
--- a/addrmatch.c
+++ b/addrmatch.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: addrmatch.c,v 1.3 2008/06/10 23:06:19 djm Exp $ */ 1/* $OpenBSD: addrmatch.c,v 1.4 2008/12/10 03:55:20 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> 4 * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org>
@@ -31,6 +31,7 @@
31 31
32#include "match.h" 32#include "match.h"
33#include "log.h" 33#include "log.h"
34#include "xmalloc.h"
34 35
35struct xaddr { 36struct xaddr {
36 sa_family_t af; 37 sa_family_t af;
@@ -417,7 +418,7 @@ addr_match_list(const char *addr, const char *_list)
417 goto foundit; 418 goto foundit;
418 } 419 }
419 } 420 }
420 free(o); 421 xfree(o);
421 422
422 return ret; 423 return ret;
423} 424}