From cd0f35999b83ec5deba60a0d72b80c3e3f4cbad2 Mon Sep 17 00:00:00 2001
From: Kulikova Svetlana <Svetlana.Kulikova@onlyoffice.com>
Date: Mon, 19 Oct 2020 13:07:37 +0300
Subject: [PATCH] fix bugs

---
 DesktopEditor/doctrenderer/docbuilder_p.cpp  | 2 +-
 DesktopEditor/doctrenderer/docbuilder_p.h    | 3 ++-
 DesktopEditor/doctrenderer/nativebuilder.cpp | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/DesktopEditor/doctrenderer/docbuilder_p.cpp b/DesktopEditor/doctrenderer/docbuilder_p.cpp
index a1388baa5e..338c59b36b 100644
--- a/DesktopEditor/doctrenderer/docbuilder_p.cpp
+++ b/DesktopEditor/doctrenderer/docbuilder_p.cpp
@@ -676,7 +676,7 @@ namespace NSDoctRenderer
             }
             else
             {
-                //bIsNoError = this->m_pInternal->ExecuteCommand(NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)_data, (LONG)_len));
+                bIsNoError = this->m_pInternal->ExecuteCommand(NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)_data, (LONG)_len));
                 sJsCommands += command;
                 sJsCommands += "\n";
             }
diff --git a/DesktopEditor/doctrenderer/docbuilder_p.h b/DesktopEditor/doctrenderer/docbuilder_p.h
index 03f5df176f..642e77a75f 100644
--- a/DesktopEditor/doctrenderer/docbuilder_p.h
+++ b/DesktopEditor/doctrenderer/docbuilder_p.h
@@ -340,7 +340,8 @@ namespace NSDoctRenderer
             oWorker.m_bIsNeedThumbnails = false;
             oWorker.m_sDirectory = sDirectory;
             NSFonts::IApplicationFonts* pFonts = oWorker.Check();
-            pFonts->Release();
+            if(pFonts)
+                pFonts->Release();
         }
 
         void CheckFileDir()
diff --git a/DesktopEditor/doctrenderer/nativebuilder.cpp b/DesktopEditor/doctrenderer/nativebuilder.cpp
index 8a27e13ccb..9fb5cb1950 100644
--- a/DesktopEditor/doctrenderer/nativebuilder.cpp
+++ b/DesktopEditor/doctrenderer/nativebuilder.cpp
@@ -215,5 +215,6 @@ void builder_CreateNativeTmpDoc(const std::string& name, JSSmart<CJSContext> con
 void builder_CreateNative      (const std::string& name, JSSmart<CJSContext> context, NSDoctRenderer::CDocBuilder* builder)
 {
     v8::Isolate* current = CV8Worker::GetCurrent();
-    context->m_internal->m_global->Set(current, name.c_str(), _builder_CreateNative(current, builder));
+    context->m_internal->m_context->Global()->Set(context->m_internal->m_context, v8::String::NewFromUtf8(current, name.c_str()), _builder_CreateNative(current, builder));
+    // context->m_internal->m_global->Set(current, name.c_str(), _builder_CreateNative(current, builder));
 }