26cfd0d699
Win daily builds are failing since then. Also Jenkins is failing intermittently so it needs more investigation Revert "New UBSan failure with Firebird 3.0.11" This reverts commit345f8cc9de. Revert "external/firebird: Reinstate UBSan function-type-mismatch fix" This reverts commitd5445a8c47. Revert "mold: fatal: cannot open loader_path/../Debug/firebird" This reverts commitf2ba02eee9. Revert "firebird: set -mmacosx-version-min to 10.15" This reverts commit6998eacf54. Revert "tdf#134526 Firebird: upgrade to release 3.0.11" This reverts commit00eae23267. Change-Id: Id4b0600965953051f6947f570c9b9a1f56044502 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162200 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
41 lines
1.6 KiB
Groff
41 lines
1.6 KiB
Groff
From f4c0aa3ba070e5c3ce996b33a31323a3a6820f0c Mon Sep 17 00:00:00 2001
|
|
From: Stephan Bergmann <sbergman@redhat.com>
|
|
Date: Wed, 2 Dec 2020 10:44:28 +0100
|
|
Subject: Fix checks for null HANDLE in Windows-only code
|
|
|
|
clang-cl failed with "error: unordered comparison between pointer and zero
|
|
('HANDLE' (aka 'void *') and 'int')" in these two places introduced with
|
|
f219283b72ab537c2b5938222708f35227c1ebde "Sub-task CORE-4463: Windows
|
|
implementation for CORE-4462 (Make it possible to restore compressed .nbk files
|
|
without explicitly decompressing them)" and
|
|
c2cfa7824189ed7c3e5a19721effdf97c07dadfd "Prevent child process hung if it
|
|
writes too much data to the pipe and overflow the pipe buffer".
|
|
---
|
|
src/utilities/nbackup/nbackup.cpp | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/utilities/nbackup/nbackup.cpp b/src/utilities/nbackup/nbackup.cpp
|
|
index 6598b6e331..4703079d67 100644
|
|
--- a/src/utilities/nbackup/nbackup.cpp
|
|
+++ b/src/utilities/nbackup/nbackup.cpp
|
|
@@ -385,7 +385,7 @@ FB_SIZE_T NBackup::read_file(FILE_HANDLE &file, void *buffer, FB_SIZE_T bufsize)
|
|
#ifdef WIN_NT
|
|
// Read child's stderr often to prevent child process hung if it writes
|
|
// too much data to the pipe and overflow the pipe buffer.
|
|
- const bool checkChild = (childStdErr > 0 && file == backup);
|
|
+ const bool checkChild = (childStdErr != 0 && file == backup);
|
|
if (checkChild)
|
|
print_child_stderr();
|
|
|
|
@@ -790,7 +790,7 @@ void NBackup::close_backup()
|
|
return;
|
|
#ifdef WIN_NT
|
|
CloseHandle(backup);
|
|
- if (childId > 0)
|
|
+ if (childId != 0)
|
|
{
|
|
const bool killed = (WaitForSingleObject(childId, 5000) != WAIT_OBJECT_0);
|
|
if (killed)
|
|
--
|
|
2.28.0
|
|
|