Skip to content

Commit a30564f

Browse files
committed
fix: Multiplication result converted to larger type
1 parent 96cf5f6 commit a30564f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

evrMrmApp/src/drvemCML.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,10 @@ MRMCML::getPattern(pattern p, unsigned char *buf, epicsUInt32 blen) const
367367
for(epicsUInt32 i=0; i<blen; i++) {
368368
size_t cmlword = (i/mult);
369369
size_t cmlbit = (i%mult);
370-
370+
371371
size_t cpuword, cpubit;
372372
bool first; // first bit in CPU word
373-
373+
374374
if(mult<32) {
375375
first = cmlbit==0;
376376
cpuword = cmlword;
@@ -386,11 +386,11 @@ MRMCML::getPattern(pattern p, unsigned char *buf, epicsUInt32 blen) const
386386
cpubit = cmlbit<8 ? 7-cmlbit : 31-(cmlbit-8);
387387
#endif
388388
}
389-
389+
390390
if(first) {
391391
val=shadowPattern[p][cpuword];
392392
}
393-
393+
394394
buf[i]=val>>cpubit;
395395
buf[i]&=0x1;
396396
}
@@ -517,7 +517,7 @@ MRMCML::syncPattern(pattern p)
517517
case cmlModePattern:
518518
switch(p) {
519519
case patternWaveform:
520-
for(size_t i=0; i<shadowWaveformlength*wordlen; i++)
520+
for(size_t i=0; i<(size_t)shadowWaveformlength*wordlen; i++)
521521
WRITE32(base, OutputCMLPat(N, i), shadowPattern[patternWaveform][i]);
522522
break;
523523
default:

0 commit comments

Comments
 (0)