timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

check return value of snprintf, fix typo, add clarification

Browse source
This commit is contained in:
Hubert Chathi 2019-10-08 17:44:09 -04:00
parent b482321213
commit fc423fad15
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/olm/olm.h
View file

@ -319,8 +319,8 @@ int olm_session_has_received_message(
); );
/** /**
* Write a string describing the internal state of an olm session * Write a null-terminated string describing the internal state of an olm
* to the buffer provided for debugging and logging purposes. * session to the buffer provided for debugging and logging purposes.
*/ */
void olm_session_describe(OlmSession * session, char *buf, size_t buflen); void olm_session_describe(OlmSession * session, char *buf, size_t buflen);

17
src/session.cpp
View file

@ -404,25 +404,32 @@ void olm::Session::describe(char *describe_buffer, size_t buflen) {
describe_buffer[0] = '\0'; describe_buffer[0] = '\0';
char *buf_pos = describe_buffer; char *buf_pos = describe_buffer;
buf_pos += snprintf( int size;
size = snprintf(
buf_pos, buflen - (buf_pos - describe_buffer), buf_pos, buflen - (buf_pos - describe_buffer),
"sender chain index: %d ", ratchet.sender_chain[0].chain_key.index "sender chain index: %d ", ratchet.sender_chain[0].chain_key.index
); );
if (size > 0) buf_pos += size;
buf_pos += snprintf(buf_pos, buflen - (buf_pos - describe_buffer), "receiver chain indcies:"); size = snprintf(buf_pos, buflen - (buf_pos - describe_buffer), "receiver chain indices:");
if (size > 0) buf_pos += size;
for (size_t i = 0; i < ratchet.receiver_chains.size(); ++i) { for (size_t i = 0; i < ratchet.receiver_chains.size(); ++i) {
buf_pos += snprintf( size = snprintf(
buf_pos, buflen - (buf_pos - describe_buffer), buf_pos, buflen - (buf_pos - describe_buffer),
" %d", ratchet.receiver_chains[i].chain_key.index " %d", ratchet.receiver_chains[i].chain_key.index
); );
if (size > 0) buf_pos += size;
} }
buf_pos += snprintf(buf_pos, buflen - (buf_pos - describe_buffer), " skipped message keys:"); size = snprintf(buf_pos, buflen - (buf_pos - describe_buffer), " skipped message keys:");
if (size >= 0) buf_pos += size;
for (size_t i = 0; i < ratchet.skipped_message_keys.size(); ++i) { for (size_t i = 0; i < ratchet.skipped_message_keys.size(); ++i) {
buf_pos += snprintf( size = snprintf(
buf_pos, buflen - (buf_pos - describe_buffer), buf_pos, buflen - (buf_pos - describe_buffer),
" %d", ratchet.skipped_message_keys[i].message_key.index " %d", ratchet.skipped_message_keys[i].message_key.index
); );
if (size > 0) buf_pos += size;
} }
} }