Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions test/src/NotePing_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,30 +102,35 @@ const char *pingTransaction(const char *request, size_t reqLen, char **response,
lastRequestLength = reqLen;
lastTransactionTimeoutMs = timeoutMs;
lastRequestEndedWithNewline = (reqLen > 0 && request[reqLen - 1] == '\n');
lastRequestHadCrc = (strstr(request, "\"crc\"") != NULL);
serialBytesRemainingAtTransaction = serialBytesRemaining;

char *requestCopy = static_cast<char *>(malloc(reqLen + 1));
if (requestCopy == NULL) {
return ERRSTR("malloc failed {mem}", c_mem);
}
memcpy(requestCopy, request, reqLen);
requestCopy[reqLen] = '\0';
lastRequestHadCrc = (strstr(requestCopy, "\"crc\"") != NULL);

if (pingResponse == PingResponse::TransactionError) {
free(requestCopy);
return ERRSTR("transaction failed {io}", c_ioerr);
}
if (response == NULL || pingResponse == PingResponse::NoResponse) {
free(requestCopy);
return NULL;
}
if (pingResponse == PingResponse::InvalidJson) {
*response = copyString("not-json");
free(requestCopy);
return NULL;
}
if (pingResponse == PingResponse::Error) {
*response = copyString("{\"err\":\"failed\"}");
free(requestCopy);
return NULL;
}

char *requestCopy = static_cast<char *>(malloc(reqLen + 1));
if (requestCopy == NULL) {
return ERRSTR("malloc failed {mem}", c_mem);
}
memcpy(requestCopy, request, reqLen);
requestCopy[reqLen] = '\0';
if (reqLen > 0 && requestCopy[reqLen - 1] == '\n') {
requestCopy[reqLen - 1] = '\0';
}
Expand Down