jyapayne/moonlight-common-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix UBSan warning for signed integer overflow

Browse source
This commit is contained in:
Cameron Gutman 2023-10-11 20:09:48 -05:00
commit 5e844aad08
2 changed files with 15 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/ControlStream.c
View file

@ -28,8 +28,8 @@ typedef struct _NVCTL_ENCRYPTED_PACKET_HEADER {
} NVCTL_ENCRYPTED_PACKET_HEADER, *PNVCTL_ENCRYPTED_PACKET_HEADER; } NVCTL_ENCRYPTED_PACKET_HEADER, *PNVCTL_ENCRYPTED_PACKET_HEADER;
typedef struct _QUEUED_FRAME_INVALIDATION_TUPLE { typedef struct _QUEUED_FRAME_INVALIDATION_TUPLE {
int startFrame; uint32_t startFrame;
int endFrame; uint32_t endFrame;
LINKED_BLOCKING_QUEUE_ENTRY entry; LINKED_BLOCKING_QUEUE_ENTRY entry;
} QUEUED_FRAME_INVALIDATION_TUPLE, *PQUEUED_FRAME_INVALIDATION_TUPLE; } QUEUED_FRAME_INVALIDATION_TUPLE, *PQUEUED_FRAME_INVALIDATION_TUPLE;
@ -77,9 +77,8 @@ static PLT_THREAD invalidateRefFramesThread;
static PLT_THREAD requestIdrFrameThread; static PLT_THREAD requestIdrFrameThread;
static PLT_THREAD controlReceiveThread; static PLT_THREAD controlReceiveThread;
static PLT_THREAD asyncCallbackThread; static PLT_THREAD asyncCallbackThread;
static int lossCountSinceLastReport; static uint32_t lastGoodFrame;
static int lastGoodFrame; static uint32_t lastSeenFrame;
static int lastSeenFrame;
static bool stopping; static bool stopping;
static bool disconnectPending; static bool disconnectPending;
static bool encryptedControlStream; static bool encryptedControlStream;
@ -321,7 +320,6 @@ int initializeControlStream(void) {
lastGoodFrame = 0; lastGoodFrame = 0;
lastSeenFrame = 0; lastSeenFrame = 0;
lossCountSinceLastReport = 0;
disconnectPending = false; disconnectPending = false;
intervalGoodFrameCount = 0; intervalGoodFrameCount = 0;
intervalTotalFrameCount = 0; intervalTotalFrameCount = 0;
@ -362,7 +360,7 @@ void destroyControlStream(void) {
PltDeleteMutex(&enetMutex); PltDeleteMutex(&enetMutex);
} }
void queueFrameInvalidationTuple(int startFrame, int endFrame) { static void queueFrameInvalidationTuple(uint32_t startFrame, uint32_t endFrame) {
LC_ASSERT(startFrame <= endFrame); LC_ASSERT(startFrame <= endFrame);
if (isReferenceFrameInvalidationEnabled()) { if (isReferenceFrameInvalidationEnabled()) {
@ -398,12 +396,12 @@ void LiRequestIdrFrame(void) {
} }
// Invalidate reference frames lost by the network // Invalidate reference frames lost by the network
void connectionDetectedFrameLoss(int startFrame, int endFrame) { void connectionDetectedFrameLoss(uint32_t startFrame, uint32_t endFrame) {
queueFrameInvalidationTuple(startFrame, endFrame); queueFrameInvalidationTuple(startFrame, endFrame);
} }
// When we receive a frame, update the number of our current frame // When we receive a frame, update the number of our current frame
void connectionReceivedCompleteFrame(int frameIndex) { void connectionReceivedCompleteFrame(uint32_t frameIndex) {
lastGoodFrame = frameIndex; lastGoodFrame = frameIndex;
intervalGoodFrameCount++; intervalGoodFrameCount++;
} }
@ -424,7 +422,7 @@ void connectionSendFrameFecStatus(PSS_FRAME_FEC_STATUS fecStatus) {
} }
} }
void connectionSawFrame(int frameIndex) { void connectionSawFrame(uint32_t frameIndex) {
LC_ASSERT_VT(!isBefore16(frameIndex, lastSeenFrame)); LC_ASSERT_VT(!isBefore16(frameIndex, lastSeenFrame));
uint64_t now = PltGetMillis(); uint64_t now = PltGetMillis();
@ -470,11 +468,6 @@ void connectionSawFrame(int frameIndex) {
lastSeenFrame = frameIndex; lastSeenFrame = frameIndex;
} }
// When we lose packets, update our packet loss count
void connectionLostPackets(int lastReceivedPacket, int nextReceivedPacket) {
lossCountSinceLastReport += (nextReceivedPacket - lastReceivedPacket) - 1;
}
// Reads an NV control stream packet from the TCP connection // Reads an NV control stream packet from the TCP connection
static PNVCTL_TCP_PACKET_HEADER readNvctlPacketTcp(void) { static PNVCTL_TCP_PACKET_HEADER readNvctlPacketTcp(void) {
NVCTL_TCP_PACKET_HEADER staticHeader; NVCTL_TCP_PACKET_HEADER staticHeader;
@ -1335,7 +1328,7 @@ static void lossStatsThreadFunc(void* context) {
while (!PltIsThreadInterrupted(&lossStatsThread)) { while (!PltIsThreadInterrupted(&lossStatsThread)) {
// Construct the payload // Construct the payload
BbInitializeWrappedBuffer(&byteBuffer, lossStatsPayload, 0, payloadLengths[IDX_LOSS_STATS], BYTE_ORDER_LITTLE); BbInitializeWrappedBuffer(&byteBuffer, lossStatsPayload, 0, payloadLengths[IDX_LOSS_STATS], BYTE_ORDER_LITTLE);
BbPut32(&byteBuffer, lossCountSinceLastReport); BbPut32(&byteBuffer, 0);
BbPut32(&byteBuffer, LOSS_REPORT_INTERVAL_MS); BbPut32(&byteBuffer, LOSS_REPORT_INTERVAL_MS);
BbPut32(&byteBuffer, 1000); BbPut32(&byteBuffer, 1000);
BbPut64(&byteBuffer, lastGoodFrame); BbPut64(&byteBuffer, lastGoodFrame);
@ -1356,9 +1349,6 @@ static void lossStatsThreadFunc(void* context) {
return; return;
} }
// Clear the transient state
lossCountSinceLastReport = 0;
// Wait a bit // Wait a bit
PltSleepMsInterruptible(&lossStatsThread, LOSS_REPORT_INTERVAL_MS); PltSleepMsInterruptible(&lossStatsThread, LOSS_REPORT_INTERVAL_MS);
} }
@ -1415,7 +1405,7 @@ static void requestIdrFrame(void) {
Limelog("IDR frame request sent\n"); Limelog("IDR frame request sent\n");
} }
static void requestInvalidateReferenceFrames(int startFrame, int endFrame) { static void requestInvalidateReferenceFrames(uint32_t startFrame, uint32_t endFrame) {
int64_t payload[3]; int64_t payload[3];
LC_ASSERT(startFrame <= endFrame); LC_ASSERT(startFrame <= endFrame);
@ -1444,8 +1434,8 @@ static void invalidateRefFramesFunc(void* context) {
while (!PltIsThreadInterrupted(&invalidateRefFramesThread)) { while (!PltIsThreadInterrupted(&invalidateRefFramesThread)) {
PQUEUED_FRAME_INVALIDATION_TUPLE qfit; PQUEUED_FRAME_INVALIDATION_TUPLE qfit;
int startFrame; uint32_t startFrame;
int endFrame; uint32_t endFrame;
// Wait for a reference frame invalidation request or a request to shutdown // Wait for a reference frame invalidation request or a request to shutdown
if (LbqWaitForQueueElement(&invalidReferenceFrameTuples, (void**)&qfit) != LBQ_SUCCESS) { if (LbqWaitForQueueElement(&invalidReferenceFrameTuples, (void**)&qfit) != LBQ_SUCCESS) {

7
src/Limelight-internal.h
View file

@ -107,10 +107,9 @@ int initializeControlStream(void);
int startControlStream(void); int startControlStream(void);
int stopControlStream(void); int stopControlStream(void);
void destroyControlStream(void); void destroyControlStream(void);
void connectionDetectedFrameLoss(int startFrame, int endFrame); void connectionDetectedFrameLoss(uint32_t startFrame, uint32_t endFrame);
void connectionReceivedCompleteFrame(int frameIndex); void connectionReceivedCompleteFrame(uint32_t frameIndex);
void connectionSawFrame(int frameIndex); void connectionSawFrame(uint32_t frameIndex);
void connectionLostPackets(int lastReceivedPacket, int nextReceivedPacket);
void connectionSendFrameFecStatus(PSS_FRAME_FEC_STATUS fecStatus); void connectionSendFrameFecStatus(PSS_FRAME_FEC_STATUS fecStatus);
int sendInputPacketOnControlStream(unsigned char* data, int length, uint8_t channelId, uint32_t flags, bool moreData); int sendInputPacketOnControlStream(unsigned char* data, int length, uint8_t channelId, uint32_t flags, bool moreData);
void flushInputOnControlStream(void); void flushInputOnControlStream(void);