aboutsummaryrefslogtreecommitdiff
path: root/javascript/olm_post.js
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-09-05 10:37:55 +0100
committerGitHub <noreply@github.com>2016-09-05 10:37:55 +0100
commitfee1748c60f48fbe3a243a36fcfcc7e8be6e4a78 (patch)
tree00629a7ab2bcb74c01e610607767db50015e98c5 /javascript/olm_post.js
parent9d16d820890e7b301baa8b69694aaea19f9bfc7f (diff)
parent1d4c13c798639c925825c70150b138553f8dff49 (diff)
Merge pull request #16 from matrix-org/rav/fix_megolm_utf8
Fix megolm decryption of UTF-8
Diffstat (limited to 'javascript/olm_post.js')
-rw-r--r--javascript/olm_post.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/javascript/olm_post.js b/javascript/olm_post.js
index 955d68d..dac89f6 100644
--- a/javascript/olm_post.js
+++ b/javascript/olm_post.js
@@ -5,7 +5,7 @@ var Pointer_stringify = Module['Pointer_stringify'];
var OLM_ERROR = Module['_olm_error']();
/* The 'length' argument to Pointer_stringify doesn't work if the input includes
- * cahracters >= 128; we therefore need to add a NULL character to all of our
+ * characters >= 128; we therefore need to add a NULL character to all of our
* strings. This acts as a symbolic constant to help show what we're doing.
*/
var NULL_BYTE_PADDING_LENGTH = 1;