[bug] Fix crash in commandSetPassword after fix of 70466; fix bug 70864

ONLYOFFICE · Oct 12, 2024 · b2ea17e · b2ea17e
1 parent 199e8f9
commit b2ea17e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/DocService/sources/canvasservice.js b/DocService/sources/canvasservice.js
@@ -880,9 +880,11 @@ function* commandSetPassword(ctx, conn, cmd, outputData) {
       let documentPasswordCurEnc = sqlBase.DocumentPassword.prototype.getCurPassword(ctx, row.password);
       if (documentPasswordCurEnc) {
         hasDocumentPassword = true;
-        const passwordCurPlain = yield utils.decryptPassword(ctx, documentPasswordCurEnc);
-        const passwordPlain = yield utils.decryptPassword(ctx, cmd.getPassword());
-        isDocumentPasswordModified = passwordCurPlain !== passwordPlain;
+        if (cmd.getPassword()) {
+          const passwordCurPlain = yield utils.decryptPassword(ctx, documentPasswordCurEnc);
+          const passwordPlain = yield utils.decryptPassword(ctx, cmd.getPassword());
+          isDocumentPasswordModified = passwordCurPlain !== passwordPlain;
+        }
       }
     }
   }