cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

LAPD: Remove all calls to 'assert' from the code 

For a system-level daemon, no protocol parser error should ever call
assert, which would take down the entire process.
This commit is contained in:
Harald Welte 2011-08-09 21:24:47 +02:00
parent 0b69bc34d7
commit 52a0b12fe1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openbsc/src/libabis/input/lapd.c
View File

@ -31,7 +31,6 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include <errno.h>
#include "lapd.h"
@ -353,14 +352,20 @@ uint8_t *lapd_receive(struct lapd_instance *li, uint8_t * data, unsigned int len
nr = -1;
if ((data[2] & 1) == 0) {
typ = LAPD_TYPE_I;
assert(len >= 4);
if (len < 4) {
LOGP(DMI, LOGL_ERROR, "LAPD I frame, len %d < 4\n", len);
return NULL;
}
ns = data[2] >> 1;
nr = data[3] >> 1;
pf = data[3] & 1;
cmd = LAPD_CMD_I;
} else if ((data[2] & 3) == 1) {
typ = LAPD_TYPE_S;
assert(len >= 4);
if (len < 4) {
LOGP(DMI, LOGL_ERROR, "LAPD S frame, len %d < 4\n", len);
return NULL;
}
nr = data[3] >> 1;
pf = data[3] & 1;
switch (data[2]) {
@ -445,7 +450,9 @@ uint8_t *lapd_receive(struct lapd_instance *li, uint8_t * data, unsigned int len
DEBUGP(DMI, "DOUBLE FRAME, ignoring\n");
cmd = 0; // ignore
} else {
assert(0);
LOGP(DMI, LOGL_ERROR, "LAPD: Out of order "
"ns %d != vr %d, ignoring\n", ns, sap->vr);
return NULL;
};
} else {
//printf("IN SEQUENCE\n");