From d4c7f20696e9a70e7b2924b7da84cd046308280d Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sun, 28 Jun 2020 11:22:54 +0200 Subject: [PATCH 1/3] Fix assertion in PseudoTTY --- SerialController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SerialController.cpp b/SerialController.cpp index 10c634a..f48cf70 100644 --- a/SerialController.cpp +++ b/SerialController.cpp @@ -226,7 +226,6 @@ m_speed(speed), m_assertRTS(assertRTS), m_fd(-1) { - assert(!device.empty()); } CSerialController::~CSerialController() @@ -235,6 +234,7 @@ CSerialController::~CSerialController() bool CSerialController::open() { + assert(!m_device.empty()); assert(m_fd == -1); #if defined(__APPLE__) From 4ae141f59463f8a59d555ed44dd5d2f1bc782f90 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 30 Jun 2020 23:11:00 +0200 Subject: [PATCH 2/3] Fix KISS --- AX25Network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AX25Network.cpp b/AX25Network.cpp index dec4ea3..d7f876d 100644 --- a/AX25Network.cpp +++ b/AX25Network.cpp @@ -142,7 +142,7 @@ unsigned int CAX25Network::read(unsigned char* data, unsigned int length) data[dataLen++] = AX25_FEND; } else if (c == AX25_TFESC && m_rxLastChar == AX25_FESC) { data[dataLen++] = AX25_FESC; - } else if (c != AX25_FESC) { + } else { data[dataLen++] = c; } From 5f0ee739e134772b0b1e0201a23a9dbc3e67a266 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Tue, 30 Jun 2020 23:19:26 +0200 Subject: [PATCH 3/3] Use correct file --- SerialController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SerialController.cpp b/SerialController.cpp index 6352743..99fe576 100644 --- a/SerialController.cpp +++ b/SerialController.cpp @@ -234,6 +234,7 @@ m_speed(speed), m_assertRTS(assertRTS), m_fd(-1) { + assert(!device.empty()); } CSerialController::CSerialController(unsigned int speed, bool assertRTS) : @@ -250,7 +251,6 @@ CSerialController::~CSerialController() bool CSerialController::open() { - assert(!m_device.empty()); assert(m_fd == -1); #if defined(__APPLE__)