Module Name: src
Committed By: christos
Date: Mon Jun 16 12:37:58 UTC 2014
Modified Files:
src/external/bsd/ipf/dist/tools: ipfstat.c
Log Message:
>From Darren Reed: #548 ipfstat hits a bus error on netbsd/sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ipf/dist/tools/ipfstat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ipf/dist/tools/ipfstat.c
diff -u src/external/bsd/ipf/dist/tools/ipfstat.c:1.4 src/external/bsd/ipf/dist/tools/ipfstat.c:1.5
--- src/external/bsd/ipf/dist/tools/ipfstat.c:1.4 Thu Jun 12 13:23:06 2014
+++ src/external/bsd/ipf/dist/tools/ipfstat.c Mon Jun 16 08:37:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipfstat.c,v 1.4 2014/06/12 17:23:06 christos Exp $ */
+/* $NetBSD: ipfstat.c,v 1.5 2014/06/16 12:37:58 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -856,8 +856,13 @@ printlivelist(fiop, out, set, fp, group,
if (fp->fr_family != 0 && fp->fr_family != AF_INET)
continue;
}
- if (fp->fr_data != NULL)
- fp->fr_data = (char *)fp + fp->fr_size;
+ if (fp->fr_data != NULL) {
+ fp->fr_data = calloc(1, fp->fr_dsize);
+ if (fp->fr_data != NULL) {
+ memcpy(fp->fr_data, (char *)fp + fp->fr_size,
+ fp->fr_dsize);
+ }
+ }
rules++;
