williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SIM: Fix output of numbers >32767 when using EBD program mode

Browse Source 
A shift of an unsigned char is interpreted as signed char, which causes
all bits above the shift result to become 1, if bit 7 of the char is 1.
This commit is contained in:
Andreas Eversberg
2020-07-18 18:00:55 +02:00
parent da54ca68ad
commit 28de2a54ca
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sim/sim.c
View File

@@ -203,20 +203,20 @@ void decode_ebdt(uint8_t *data, char *futln, char *sicherung, char *karten, char
my_ultostr(futln++, data[0] & 0x1f, 1); my_ultostr(futln++, data[0] & 0x1f, 1);
if (*futln) if (*futln)
futln++; futln++;
my_ultostr(futln, (data[1] << 8) | data[2], 5); my_ultostr(futln, ((uint16_t)data[1] << 8) | (uint16_t)data[2], 5);
} }
if (sicherung) if (sicherung)
my_ultostr(sicherung, (data[3] << 8) | data[4], 1); my_ultostr(sicherung, ((uint16_t)data[3] << 8) | (uint16_t)data[4], 1);
if (karten) if (karten)
my_ultostr(karten, data[5] >> 5, 1); my_ultostr(karten, data[5] >> 5, 1);
if (sonder) if (sonder)
my_ultostr(sonder, ((data[5] & 0x1f) << 8) | data[6], 1); my_ultostr(sonder, ((uint16_t)(data[5] & 0x1f) << 8) | (uint16_t)data[6], 1);
if (wartung) if (wartung)
my_ultostr(wartung, (data[7] << 8) | data[8], 1); my_ultostr(wartung, ((uint16_t)data[7] << 8) | (uint16_t)data[8], 1);
} }
/* get size of phone directory (including allocation map) */ /* get size of phone directory (including allocation map) */