deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2035 from simonduq/pr/csma-fix

Browse source 
CSMA bugfix: do not use field on a struct that may have been deallocated
This commit is contained in:
Nicolas Tsiftes 2017-01-09 08:45:49 +01:00 committed by GitHub
parent 53efcec1fa 0de3563ddb
commit 1537488e74
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/mac/csma.c
View file

@ -231,10 +231,12 @@ tx_done(int status, struct rdc_buf_list *q, struct neighbor_queue *n)
mac_callback_t sent; mac_callback_t sent;
struct qbuf_metadata *metadata; struct qbuf_metadata *metadata;
void *cptr; void *cptr;
uint8_t ntx;
metadata = (struct qbuf_metadata *)q->ptr; metadata = (struct qbuf_metadata *)q->ptr;
sent = metadata->sent; sent = metadata->sent;
cptr = metadata->cptr; cptr = metadata->cptr;
ntx = n->transmissions;
switch(status) { switch(status) {
case MAC_TX_OK: case MAC_TX_OK:
@ -251,7 +253,7 @@ tx_done(int status, struct rdc_buf_list *q, struct neighbor_queue *n)
} }
free_packet(n, q, status); free_packet(n, q, status);
mac_call_sent_callback(sent, cptr, status, n->transmissions); mac_call_sent_callback(sent, cptr, status, ntx);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void