[bug] Handle CONVERT_CELLLIMITS exit code; Fix bug 72913; Fix bug 71510

ONLYOFFICE · Jan 29, 2025 · 477bcf0 · 477bcf0
1 parent b2e21a6
commit 477bcf0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/Common/sources/constants.js b/Common/sources/constants.js
@@ -233,6 +233,7 @@ exports.CONVERT_ICU = -92;
 exports.CONVERT_LIMITS = -93;
 exports.CONVERT_TEMPORARY = -94;
 exports.CONVERT_DETECT = -95;
+exports.CONVERT_CELLLIMITS = -96;
 exports.CONVERT_DEAD_LETTER = -99;
 exports.UPLOAD = -100;
 exports.UPLOAD_CONTENT_LENGTH = -101;

diff --git a/Common/sources/utils.js b/Common/sources/utils.js
@@ -538,6 +538,7 @@ exports.mapAscServerErrorToOldError = function(error) {
   var res = -1;
   switch (error) {
     case constants.NO_ERROR :
+    case constants.CONVERT_CELLLIMITS :
       res = 0;
       break;
     case constants.TASK_QUEUE :

diff --git a/FileConverter/sources/converter.js b/FileConverter/sources/converter.js
@@ -901,7 +901,8 @@ function* postProcess(ctx, cmd, dataConvert, tempDirs, childRes, error, isTimeou
     exitCode = childRes.status;
     exitSignal = childRes.signal;
   }
-  if (0 !== exitCode || null !== exitSignal) {
+  //CONVERT_CELLLIMITS is not an error, but an indicator that data was lost during opening (can be displayed as an error)
+  if ((0 !== exitCode && constants.CONVERT_CELLLIMITS !== -exitCode) || null !== exitSignal) {
     if (-1 !== exitCodesReturn.indexOf(-exitCode)) {
       error = -exitCode;
     } else if(isTimeout) {