FlapJackApps/libdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Subsurface-branch

Browse Source
This commit is contained in:
Dirk Hohndel 2015-12-14 09:33:53 -08:00
commit e227a4c5a7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mares_iconhd.c
View File

@ -478,6 +478,8 @@ mares_iconhd_extract_dives (dc_device_t *abstract, const unsigned char data[], u
break;
}
if (eop < layout->rb_profile_begin || eop >= layout->rb_profile_end) {
if (eop == 0xFFFFFFFF)
return DC_STATUS_SUCCESS; // No dives available.
ERROR (context, "Ringbuffer pointer out of range (0x%08x).", eop);
return DC_STATUS_DATAFORMAT;
}

2
src/serial_posix.c
View File

@ -417,7 +417,7 @@ serial_configure (serial_t *device, int baudrate, int databits, int parity, int
}
// Apply the new settings.
if (tcsetattr (device->fd, TCSANOW, &tty) != 0) {
if (tcsetattr (device->fd, TCSANOW, &tty) != 0 && NOPTY) {
#if 0 // who cares
SYSERROR (device->context, errno);
return -1;