From: djm <djm>
Date: Wed, 28 Jan 2009 05:16:00 +0000 (+0000)
Subject:    - stevesk@cvs.openbsd.org 2008/12/10 03:55:20
X-Git-Tag: V_5_2_P1~42
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/fd2ce9c63f8b2dd01db6f681b5838d5df6da4a9e

   - 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@
---

diff --git a/ChangeLog b/ChangeLog
index 3314fc4d..811c219d 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.
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;
 }