aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2003-09-04 01:29:04 +0000
committerBill Nottingham <notting@redhat.com>2003-09-04 01:29:04 +0000
commit5314a78645f6ed81cfee58c8039f6e350a124240 (patch)
treebcdc3440d772c1abc8596b26c6bee13888a5387c
parent4296a0c54c6628e0fe445f089ff73e6cd1725e81 (diff)
downloadinitscripts-5314a78645f6ed81cfee58c8039f6e350a124240.tar
initscripts-5314a78645f6ed81cfee58c8039f6e350a124240.tar.gz
initscripts-5314a78645f6ed81cfee58c8039f6e350a124240.tar.bz2
initscripts-5314a78645f6ed81cfee58c8039f6e350a124240.tar.xz
initscripts-5314a78645f6ed81cfee58c8039f6e350a124240.zip
fix some memory handling (#85478, <miked@ed.ac.uk>)
-rw-r--r--src/ipcalc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ipcalc.c b/src/ipcalc.c
index f90ff456..468a037c 100644
--- a/src/ipcalc.c
+++ b/src/ipcalc.c
@@ -296,7 +296,7 @@ int main(int argc, const char **argv) {
}
tmp = NULL;
for (; i>0; i--) {
- tmp = malloc(strlen(ipStr + 3));
+ tmp = malloc(strlen(ipStr) + 3);
sprintf(tmp,"%s.0",ipStr);
ipStr = tmp;
}
@@ -308,13 +308,14 @@ int main(int argc, const char **argv) {
return 1;
}
- poptFreeContext(optCon);
if (!(showNetmask|showPrefix|showBroadcast|showNetwork|showHostname)) {
poptPrintHelp(optCon, stderr, 0);
return 1;
}
+ poptFreeContext(optCon);
+
/* we know what we want to display now, so display it. */
if (showNetmask) {