Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

firmata.c: fix possible crash if devs is wrong

Browse Source 
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2016-03-11 16:36:40 +00:00
parent 5789f5001d
commit 91452e5c83
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/firmata/firmata.c
View File

@@ -245,9 +245,9 @@ firmata_endParse(t_firmata* firmata)
printf("i2c reply is %d\n", firmata->i2cmsg[addr][reg]); printf("i2c reply is %d\n", firmata->i2cmsg[addr][reg]);
#endif #endif
} else { } else {
if (firmata->devs != NULL) {
struct _firmata* devs = firmata->devs[0]; struct _firmata* devs = firmata->devs[0];
int i = 0; int i = 0;
if (devs != NULL) {
for (i; i < firmata->dev_count; i++, devs++) { for (i; i < firmata->dev_count; i++, devs++) {
if (devs != NULL) { if (devs != NULL) {
if (firmata->parse_buff[1] == devs->feature) { if (firmata->parse_buff[1] == devs->feature) {

4
src/firmata/firmata_mraa.c
View File

@@ -464,6 +464,10 @@ mraa_firmata_plat_init(const char* uart_dev)
} }
firmata_dev = firmata_new(uart_dev); firmata_dev = firmata_new(uart_dev);
if (firmata_dev == NULL) {
free(b);
return NULL;
}
// if this isn't working then we have an issue with our uart // if this isn't working then we have an issue with our uart
while (!firmata_dev->isReady) { while (!firmata_dev->isReady) {