riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5814 from makomi/nordic_softdevice_ble

Browse Source 
pkg/nordic_softdevice_ble: gnrc_nordic_ble_6lowpan: fix nullPointer error (cppcheck)
This commit is contained in:
Kaspar Schleiser 2016-09-05 15:58:30 +02:00 committed by GitHub
commit 42a50faaa6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/nordic_softdevice_ble/src/gnrc_nordic_ble_6lowpan.c
View File

@ -127,6 +127,11 @@ static void _handle_raw_sixlowpan(ble_mac_inbuf_t *inbuf)
static int _send(gnrc_pktsnip_t *pkt) static int _send(gnrc_pktsnip_t *pkt)
{ {
if (pkt == NULL) {
DEBUG("_send_ble: pkt was NULL\n");
return -EINVAL;
}
gnrc_netif_hdr_t *netif_hdr; gnrc_netif_hdr_t *netif_hdr;
gnrc_pktsnip_t *payload = pkt->next; gnrc_pktsnip_t *payload = pkt->next;
uint8_t *dst; uint8_t *dst;
@ -139,10 +144,6 @@ static int _send(gnrc_pktsnip_t *pkt)
uint8_t *buf = _sendbuf; uint8_t *buf = _sendbuf;
unsigned len = 0; unsigned len = 0;
if (pkt == NULL) {
DEBUG("_send_ble: pkt was NULL\n");
return -EINVAL;
}
if (pkt->type != GNRC_NETTYPE_NETIF) { if (pkt->type != GNRC_NETTYPE_NETIF) {
DEBUG("_send_ble: first header is not generic netif header\n"); DEBUG("_send_ble: first header is not generic netif header\n");
return -EBADMSG; return -EBADMSG;