From 4054d5307555ef16defff92624eac233117eb3d4 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 14 Feb 2022 13:03:44 +0000 Subject: [PATCH 1/2] USB DMX Free the transfer first to avoid segfaults in libusb >= 1.0.25 --- plugins/usbdmx/AsyncUsbTransceiverBase.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/usbdmx/AsyncUsbTransceiverBase.cpp b/plugins/usbdmx/AsyncUsbTransceiverBase.cpp index 78e338461f..e9a17955d4 100644 --- a/plugins/usbdmx/AsyncUsbTransceiverBase.cpp +++ b/plugins/usbdmx/AsyncUsbTransceiverBase.cpp @@ -57,8 +57,9 @@ AsyncUsbTransceiverBase::AsyncUsbTransceiverBase(LibUsbAdaptor *adaptor, AsyncUsbTransceiverBase::~AsyncUsbTransceiverBase() { CancelTransfer(); - m_adaptor->UnrefDevice(m_usb_device); + // Free the transfer first to avoid segfaults in libusb >= 1.0.25 m_adaptor->FreeTransfer(m_transfer); + m_adaptor->UnrefDevice(m_usb_device); } bool AsyncUsbTransceiverBase::Init() { From 487176ead211cbf229a6414abc55ac3fb7e0c15f Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 14 Apr 2022 13:17:15 +0100 Subject: [PATCH 2/2] Remove a duplicate line in the RPC docs --- doxygen/rpc.dox | 1 - 1 file changed, 1 deletion(-) diff --git a/doxygen/rpc.dox b/doxygen/rpc.dox index 93dee8fb2f..81e740bbc9 100644 --- a/doxygen/rpc.dox +++ b/doxygen/rpc.dox @@ -186,7 +186,6 @@ required Type type = 1; optional uint32 id = 2; optional string name = 3; - optional string name = 3; optional bytes buffer = 4; } ~~~~~~~~~~~~~~~~~~~~~