Kaydet (Commit) 14bc2d23 authored tarafından Christian Lohmaier's avatar Christian Lohmaier

tdf#92483 fix initializing JRE on Win 64bit (load java's msvcr100.dll)

problem is that the offsets/sizes are of different type than ptrdiff_t,
and when using without casting, the resulting address is way off...

Change-Id: I7b1cdd611c8c4b317cd33ca8fbbda2e7e8f5f4fc
Reviewed-on: https://gerrit.libreoffice.org/16938Reviewed-by: 's avatarDavid Ostrovsky <david@ostrovsky.org>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
(cherry picked from commit 1b4d27a3)
Reviewed-on: https://gerrit.libreoffice.org/16950
üst 607af001
...@@ -591,7 +591,7 @@ static void do_msvcr_magic(rtl_uString *jvm_dll) ...@@ -591,7 +591,7 @@ static void do_msvcr_magic(rtl_uString *jvm_dll)
if (sections->VirtualAddress <= importsVA && if (sections->VirtualAddress <= importsVA &&
importsVA < sections->VirtualAddress + sections->SizeOfRawData) importsVA < sections->VirtualAddress + sections->SizeOfRawData)
{ {
VAtoPhys = sections->PointerToRawData - sections->VirtualAddress; VAtoPhys = static_cast<size_t>(sections->PointerToRawData) - static_cast<size_t>(sections->VirtualAddress);
break; break;
} }
++sections; ++sections;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment