folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed potential memory leaks on error paths in scp.c/sim_rest (Peter Schorn)

Browse source
This commit is contained in:
Mark Pizzolato 2012-05-05 09:23:19 -07:00
parent 928b4a071f
commit 54ad020b4e
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scp.c
View file

@ -3118,8 +3118,10 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) { /* loop thru devices */
for (l = 0; (l < SRBSIZ) && (k < high); l++, for (l = 0; (l < SRBSIZ) && (k < high); l++,
k = k + (dptr->aincr)) { /* check for 0 block */ k = k + (dptr->aincr)) { /* check for 0 block */
r = dptr->examine (&val, k, uptr, SIM_SW_REST); r = dptr->examine (&val, k, uptr, SIM_SW_REST);
if (r != SCPE_OK) if (r != SCPE_OK) {
free (mbuf);
return r; return r;
}
if (val) zeroflg = FALSE; if (val) zeroflg = FALSE;
SZ_STORE (sz, val, mbuf, l); SZ_STORE (sz, val, mbuf, l);
} /* end for l */ } /* end for l */
@ -3358,19 +3360,26 @@ for ( ;; ) { /* device loop */
if ((mbuf = calloc (SRBSIZ, sz)) == NULL) if ((mbuf = calloc (SRBSIZ, sz)) == NULL)
return SCPE_MEM; return SCPE_MEM;
for (k = 0; k < high; ) { /* loop thru mem */ for (k = 0; k < high; ) { /* loop thru mem */
READ_I (blkcnt); /* block count */ if (sim_fread (&blkcnt, sizeof (blkcnt), 1, rfile) == 0) {/* block count */
free (mbuf);
return SCPE_IOERR;
}
if (blkcnt < 0) /* compressed? */ if (blkcnt < 0) /* compressed? */
limit = -blkcnt; limit = -blkcnt;
else limit = (int32)sim_fread (mbuf, sz, blkcnt, rfile); else limit = (int32)sim_fread (mbuf, sz, blkcnt, rfile);
if (limit <= 0) /* invalid or err? */ if (limit <= 0) { /* invalid or err? */
free (mbuf);
return SCPE_IOERR; return SCPE_IOERR;
}
for (j = 0; j < limit; j++, k = k + (dptr->aincr)) { for (j = 0; j < limit; j++, k = k + (dptr->aincr)) {
if (blkcnt < 0) /* compressed? */ if (blkcnt < 0) /* compressed? */
val = 0; val = 0;
else SZ_LOAD (sz, val, mbuf, j); /* saved value */ else SZ_LOAD (sz, val, mbuf, j); /* saved value */
r = dptr->deposit (val, k, uptr, SIM_SW_REST); r = dptr->deposit (val, k, uptr, SIM_SW_REST);
if (r != SCPE_OK) if (r != SCPE_OK) {
free (mbuf);
return r; return r;
}
} /* end for j */ } /* end for j */
} /* end for k */ } /* end for k */
free (mbuf); /* dealloc buffer */ free (mbuf); /* dealloc buffer */