self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-06 09:19:22 +02:00
Code Issues Releases Activity

All: Fixed crash when having invalid UTF-8 string in text editor

Browse Source
This commit is contained in:
Laurent Cozic
2018-01-31 19:01:11 +00:00
parent 9e979804f3
commit d6de56b2db
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CliClient/app/command-sync.js
View File

@@ -101,7 +101,7 @@ class Command extends BaseCommand {
this.releaseLockFn_ = null; this.releaseLockFn_ = null;
// Lock is unique per profile/database // Lock is unique per profile/database
const lockFilePath = osTmpdir() + '/synclock_' + md5(Setting.value('profileDir')); const lockFilePath = osTmpdir() + '/synclock_' + md5(escape(Setting.value('profileDir'))); // https://github.com/pvorb/node-md5/issues/41
if (!await fs.pathExists(lockFilePath)) await fs.writeFile(lockFilePath, 'synclock'); if (!await fs.pathExists(lockFilePath)) await fs.writeFile(lockFilePath, 'synclock');
try { try {

2
ReactNativeClient/lib/MdToHtml.js
View File

@@ -28,7 +28,7 @@ class MdToHtml {
const r = resources[n]; const r = resources[n];
k.push(r.id); k.push(r.id);
} }
k.push(md5(body)); k.push(md5(escape(body))); // https://github.com/pvorb/node-md5/issues/41
k.push(md5(JSON.stringify(style))); k.push(md5(JSON.stringify(style)));
k.push(md5(JSON.stringify(options))); k.push(md5(JSON.stringify(options)));
return k.join('_'); return k.join('_');