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

I1401: Protect character conversions from garbage files (COVERITY)

Browse source
This commit is contained in:
Bob Supnik 2017-03-09 19:48:31 -08:00 • committed by Mark Pizzolato
parent 396dd88def
commit 9048245287
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
I1401/i1401_cd.c
View file

@ -1,6 +1,6 @@
/* i1401_cd.c: IBM 1402 card reader/punch /* i1401_cd.c: IBM 1402 card reader/punch
Copyright (c) 1993-2016, Robert M. Supnik Copyright (c) 1993-2017, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@ -35,6 +35,7 @@
Cards are represented as ASCII text streams terminated by newlines. Cards are represented as ASCII text streams terminated by newlines.
This allows cards to be created and edited as normal files. This allows cards to be created and edited as normal files.
09-Mar-17 RMS Protect character conversions from gargage files (COVERITY)
05-May-16 RMS Fixed calling sequence inconsistency (Mark Pizzolato) 05-May-16 RMS Fixed calling sequence inconsistency (Mark Pizzolato)
28-Feb-15 RMS Added read from console 28-Feb-15 RMS Added read from console
24-Mar-09 RMS Fixed read stacker operation in column binary mode 24-Mar-09 RMS Fixed read stacker operation in column binary mode
@ -251,12 +252,12 @@ if (r != SCPE_OK) /* read error? */
if (cbn) { /* column binary? */ if (cbn) { /* column binary? */
for (i = 0; i < CDR_WIDTH; i++) { for (i = 0; i < CDR_WIDTH; i++) {
if (conv_old) { if (conv_old) {
c1 = ascii2bcd (cdr_buf[i]); c1 = ascii2bcd (cdr_buf[i] & 0177);
c2 = ascii2bcd (cdr_buf[CDR_WIDTH + i]); c2 = ascii2bcd (cdr_buf[CDR_WIDTH + i] & 0177);
} }
else { else {
c1 = ascii2bcd (cdr_buf[2 * i]); c1 = ascii2bcd (cdr_buf[2 * i] & 0177);
c2 = ascii2bcd (cdr_buf[(2 * i) + 1]); c2 = ascii2bcd (cdr_buf[(2 * i) + 1] & 0177);
} }
M[CD_CBUF1 + i] = (M[CD_CBUF1 + i] & WM) | c1; M[CD_CBUF1 + i] = (M[CD_CBUF1 + i] & WM) | c1;
M[CD_CBUF2 + i] = (M[CD_CBUF2 + i] & WM) | c2; M[CD_CBUF2 + i] = (M[CD_CBUF2 + i] & WM) | c2;