From 78874331de762c389702a040ef7f0d126fa71d8d Mon Sep 17 00:00:00 2001 From: Martin Date: Fri, 7 Feb 2014 09:06:34 +0100 Subject: [PATCH] fix changed checking order to avoid possible access violation --- sys/transceiver/transceiver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/transceiver/transceiver.c b/sys/transceiver/transceiver.c index 13a06f4bfd..0b853df651 100644 --- a/sys/transceiver/transceiver.c +++ b/sys/transceiver/transceiver.c @@ -220,8 +220,8 @@ uint8_t transceiver_register(transceiver_type_t t, int pid) uint8_t i; /* find pid in registered threads or first unused space */ - for (i = 0; ((reg[i].pid != pid) && - (i < TRANSCEIVER_MAX_REGISTERED) && + for (i = 0; ((i < TRANSCEIVER_MAX_REGISTERED) && + (reg[i].pid != pid) && (reg[i].transceivers != TRANSCEIVER_NONE)); i++); if (i >= TRANSCEIVER_MAX_REGISTERED) {