Skip to content

Commit 0e15ad3

Browse files
committed
Revert "Removed flexible array usage due to error on g++ 10.x"
This reverts commit e843822.
1 parent e843822 commit 0e15ad3

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

qt/cmd.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ typedef struct __attribute__((__packed__))
6464
{
6565
Cmd cmd;
6666
uint8_t len;
67+
uint8_t data[];
6768
} WriteDataCmd;
6869

6970
typedef struct __attribute__((__packed__))
@@ -135,6 +136,7 @@ typedef struct __attribute__((__packed__))
135136
{
136137
uint8_t code;
137138
uint8_t info;
139+
uint8_t data[];
138140
} RespHeader;
139141

140142
typedef struct __attribute__((__packed__))

qt/reader.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ int Reader::handleStatus(uint8_t *pbuf, uint32_t len)
159159
int Reader::handleData(uint8_t *pbuf, uint32_t len)
160160
{
161161
RespHeader *header = reinterpret_cast<RespHeader *>(pbuf);
162-
uint8_t *data = pbuf + sizeof(RespHeader);
163162
uint8_t dataSize = header->info;
164163
size_t headerSize = sizeof(RespHeader), packetSize = headerSize + dataSize;
165164

@@ -179,7 +178,7 @@ int Reader::handleData(uint8_t *pbuf, uint32_t len)
179178
return -1;
180179
}
181180

182-
memcpy(rbuf + readOffset, data, dataSize);
181+
memcpy(rbuf + readOffset, header->data, dataSize);
183182
readOffset += dataSize;
184183
bytesRead += dataSize;
185184

0 commit comments

Comments
 (0)