Fix memory bug

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/259

DesktopEditor/doctrenderer/docbuilder.python/src/docbuilder.py

@@ -609,14 +609,15 @@ class FileTypes:
         PNG = _IMAGE_MASK + 0x0005
         BMP = _IMAGE_MASK + 0x0008
 
-builder_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'lib')
+# NOTE: do not change builder_path manually!
+builder_path = os.path.dirname(os.path.realpath(__file__))
 _loadLibrary(builder_path)
 CDocBuilder.Initialize(builder_path)
 
 def registerLibrary(license_path):
-    docbuilder_bin = os.path.dirname(os.path.realpath(__file__)) + "/lib/docbuilder"
+    docbuilder_bin = os.path.join(builder_path, "docbuilder")
     if ("windows" == platform.system().lower()):
         docbuilder_bin += ".exe"
-    return subprocess.call([docbuilder_bin, "-register", license_path], stderr=subprocess.STDOUT, shell=True)    
+    return subprocess.call([docbuilder_bin, "-register", license_path], stderr=subprocess.STDOUT, shell=True)
 
 atexit.register(CDocBuilder.Dispose)

OOXML/Common/SimpleTypes_Spreadsheet.cpp

@@ -589,7 +589,7 @@ namespace SimpleTypes
 				this->m_eValue = underlineDouble;
 			else if(L"doubleAccounting" == sValue)
 				this->m_eValue = underlineDoubleAccounting;
-			else if(L"none" == sValue)
+            else if(L"none" == sValue || L"0" == sValue)
 				this->m_eValue = underlineNone;
 			else if(L"single" == sValue)
 				this->m_eValue = underlineSingle;

OOXML/XlsxFormat/Worksheets/SheetData.cpp

@@ -1158,7 +1158,7 @@ namespace OOX
                         ColumnRef = static_cast<XLS::PtgExtraCol*>(BinFmla.rgcb.getPtgs().back().get())->col;
                         if(!SharedFormulasRef::sharedRefsLocations)
                             SharedFormulasRef::sharedRefsLocations = std::unique_ptr<std::map<_UINT32, XLS::CellRef>>(new std::map<_UINT32, XLS::CellRef>);
-                        m_oSi = (unsigned int)SharedFormulasRef::sharedRefsLocations->size() - 1;
+                        m_oSi = (unsigned int)SharedFormulasRef::sharedRefsLocations->size();
                         SharedFormulasRef::sharedRefsLocations->emplace(m_oSi->GetValue(), XLS::CellRef(rowRef, ColumnRef, true, true));
 
                     }
@@ -4369,7 +4369,7 @@ namespace OOX
         }
         bool CRow::compressCell(CCell* pCell)
         {
-            if(!pCell->m_oValue.IsInit() && !m_arrItems.empty())
+            if(!pCell->m_oValue.IsInit() && !pCell->m_oFormula.IsInit() && !m_arrItems.empty())
             {
                 auto prevCell = m_arrItems.back();
                 if(!prevCell->m_oRepeated.IsInit())

X2tConverter/src/run.h

@@ -181,33 +181,29 @@ namespace NSX2T
 
 			char** penv;
 #ifndef _MAC
+			char* nenv[2];
+			nenv[0] = &sLibraryDir[0];
+			nenv[1] = NULL;
+			penv = nenv;
+
 			if(bIsSaveEnvironment)
 			{
 				putenv(&sLibraryDir[0]);
 				penv = environ;
 			}
-			else
-			{
-				char* nenv[2];
-				nenv[0] = &sLibraryDir[0];
-				nenv[1] = NULL;
-				penv = nenv;
-			}
 #else
+			char* nenv[3];
+			nenv[0] = &sLibraryDir[0];
+			nenv[1] = &sPATH[0];
+			nenv[2] = NULL;
+			penv = nenv;
+
 			if(bIsSaveEnvironment)
 			{
 				putenv(&sLibraryDir[0]);
 				putenv(&sPATH[0]);
 				penv = environ;
 			}
-			else
-			{
-				char* nenv[3];
-				nenv[0] = &sLibraryDir[0];
-				nenv[1] = &sPATH[0];
-				nenv[2] = NULL;
-				penv = nenv;
-			}
 #endif
 			execve(sProgramm.c_str(),
 				   (char * const *)nargs,