jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 3 +++ 1 file changed, 3 insertions(+)
New commits: commit c10153d0ef46527232adb9c4574a79940d978175 Author: Markus Mohrhard <[email protected]> Date: Wed Jun 15 20:15:20 2016 +0200 passing a NULL pointer to fileno is not allowed, tdf#38913 See crash reports at http://crashreport.libreoffice.org/stats/signature/do_msvcr_magic+0x7 and documentation at https://msdn.microsoft.com/en-us/library/zs6wbdhx.aspx Change-Id: Ia9166d3b9fa10b87585821504e39cdfecbd22eda Reviewed-on: https://gerrit.libreoffice.org/26317 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Markus Mohrhard <[email protected]> (cherry picked from commit b5876bfcb69a65c87d602bae687b3c0634c0a1e7) diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index fad3c0a9..43ddc82 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -548,6 +548,9 @@ static void do_msvcr_magic(rtl_uString *jvm_dll) FILE *f = _wfopen(reinterpret_cast<LPCWSTR>(Module->buffer), L"rb"); + if (!f) + return; + if (fstat(fileno(f), &st) == -1) { fclose(f); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
