diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2016-12-16 15:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 15:01:45 +0000 |
| commit | 819f0d24dbd92acd29b588f618d7830943bc18f9 (patch) | |
| tree | e53c21d74558b47c7c20238d75d814273b399a82 /javascript/olm_outbound_group_session.js | |
| parent | 7fd63bcac7110abd5a1eef927abc3184da68a35c (diff) | |
| parent | 8e554ab5ef5a17c7eb271000217e036be07d88db (diff) | |
Merge pull request #40 from matrix-org/rav/fix_encryption
Avoid buffer overrun on encryption
Diffstat (limited to 'javascript/olm_outbound_group_session.js')
| -rw-r--r-- | javascript/olm_outbound_group_session.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/javascript/olm_outbound_group_session.js b/javascript/olm_outbound_group_session.js index 0402c3c..24ea644 100644 --- a/javascript/olm_outbound_group_session.js +++ b/javascript/olm_outbound_group_session.js @@ -83,6 +83,14 @@ OutboundGroupSession.prototype['encrypt'] = function(plaintext) { plaintext_buffer, plaintext_length, message_buffer, message_length ); + + // UTF8ToString requires a null-terminated argument, so add the + // null terminator. + Module['setValue']( + message_buffer+message_length, + 0, "i8" + ); + return Module['UTF8ToString'](message_buffer); } finally { if (plaintext_buffer !== undefined) { |