From 3d3bc7a062ea264d6117dbadb7e8d62fcde344d2 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Wed, 9 May 2018 11:59:39 +0300 Subject: [PATCH 1/4] Null check --- src/browser/NativeMessagingHost.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/NativeMessagingHost.cpp b/src/browser/NativeMessagingHost.cpp index db1a1319d..cb757e65e 100755 --- a/src/browser/NativeMessagingHost.cpp +++ b/src/browser/NativeMessagingHost.cpp @@ -78,7 +78,7 @@ void NativeMessagingHost::run() QFile::remove(serverPath); // Ensure that STDIN is not being listened when proxy is used - if (m_notifier->isEnabled()) { + if (m_notifier && m_notifier->isEnabled()) { m_notifier->setEnabled(false); } From 4f304aa384ca4a4689771fef6fe23322ef33ed7e Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Wed, 9 May 2018 06:47:34 -0400 Subject: [PATCH 2/4] Fix Windows 32-bit building with ASLR --- CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e545d1a6..15ac18bbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,6 +125,10 @@ elseif(KEEPASSXC_DIST_TYPE STREQUAL "Other") unset(KEEPASSXC_DIST) endif() +if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4") + set(IS_32BIT TRUE) +endif() + if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_COMPILER_IS_CLANG 1) endif() @@ -245,8 +249,13 @@ if(MINGW) set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") if(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")) # Enable DEP and ASLR - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--high-entropy-va") - set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--high-entropy-va") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--nxcompat -Wl,--dynamicbase") + # Enable high entropy ASLR for 64-bit builds + if(NOT IS_32BIT) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--high-entropy-va") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--high-entropy-va") + endif() endif() endif() From 34ed6fdd1c77977201092de432055c5f07ddcef7 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Wed, 9 May 2018 19:22:16 +0200 Subject: [PATCH 3/4] Bump version to 2.3.3 --- CHANGELOG | 5 +++++ CMakeLists.txt | 2 +- share/linux/org.keepassxc.KeePassXC.appdata.xml | 7 +++++++ snapcraft.yaml | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 4e344b748..9eafaa6d8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +2.3.3 (2018-05-09) +========================= + +- Fix crash when browser integration is enabled [#1923] + 2.3.2 (2018-05-07) ========================= diff --git a/CMakeLists.txt b/CMakeLists.txt index 15ac18bbd..f2ad273d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ set(CMAKE_AUTOUIC ON) set(KEEPASSXC_VERSION_MAJOR "2") set(KEEPASSXC_VERSION_MINOR "3") -set(KEEPASSXC_VERSION_PATCH "2") +set(KEEPASSXC_VERSION_PATCH "3") set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}") set(KEEPASSXC_BUILD_TYPE "Snapshot" CACHE STRING "Set KeePassXC build type to distinguish between stable releases and snapshots") diff --git a/share/linux/org.keepassxc.KeePassXC.appdata.xml b/share/linux/org.keepassxc.KeePassXC.appdata.xml index ba7f8e6fc..2f1747949 100644 --- a/share/linux/org.keepassxc.KeePassXC.appdata.xml +++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml @@ -50,6 +50,13 @@ + + +
    +
  • Fix crash when browser integration is enabled [#1923]
    • +
+ +
    diff --git a/snapcraft.yaml b/snapcraft.yaml index 16810cd5c..5a3597c30 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: keepassxc -version: 2.3.2 +version: 2.3.3 grade: stable summary: Community-driven port of the Windows application “KeePass Password Safe” description: | From 27b08725fcb91382e67b5a78f23db3460770591a Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Wed, 9 May 2018 19:25:16 +0200 Subject: [PATCH 4/4] Update translations --- share/translations/keepassx_ca.ts | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/share/translations/keepassx_ca.ts b/share/translations/keepassx_ca.ts index a09811133..20316f161 100644 --- a/share/translations/keepassx_ca.ts +++ b/share/translations/keepassx_ca.ts @@ -260,7 +260,7 @@ Seleccioneu si voleu permetre l'accés. Re&quest to unlock the database if it is locked - Sol·licitar el desbloqueig de la base de dades si està blocada + Sol·licita el desbloqueig de la base de dades si està blocada Only entries with the same scheme (http://, https://, ...) are returned. @@ -575,7 +575,7 @@ Please consider generating a new key file. Copy history - Còpia el historial + Copia el historial @@ -1248,7 +1248,7 @@ Do you want to merge your changes? Never - + Mai [PROTECTED] @@ -1897,7 +1897,7 @@ This may cause the affected plugins to malfunction. Never - + Mai Password @@ -1913,15 +1913,15 @@ This may cause the affected plugins to malfunction. Created - + Creat Modified - + Modificat Accessed - + Accedit Attachments @@ -2667,7 +2667,7 @@ Es tracta d'una migració unidireccional. No obrir la base de dades importa &Close database - Tanca base de dades + Tanca la base de dades &New database @@ -2727,11 +2727,11 @@ Es tracta d'una migració unidireccional. No obrir la base de dades importa Copy &username - Còpia el nom d'&usuari + Copia el nom d'&usuari Copy username to clipboard - Còpia el nom d'usuari al porta-retalls + Copia el nom d'usuari al porta-retalls Cop&y password @@ -2739,11 +2739,11 @@ Es tracta d'una migració unidireccional. No obrir la base de dades importa Copy password to clipboard - Còpia la contrasenya al porta-retalls + Copia la contrasenya al porta-retalls &Settings - &Conficuració + &Configuració Password Generator @@ -2751,7 +2751,7 @@ Es tracta d'una migració unidireccional. No obrir la base de dades importa &Perform Auto-Type - Realitza complació automètica + Realitza compleció automàtica &Open URL @@ -2759,7 +2759,7 @@ Es tracta d'una migració unidireccional. No obrir la base de dades importa &Lock databases - &bloqueja la bases de dades + &Bloqueja la bases de dades &Title @@ -3510,11 +3510,11 @@ Available commands: Last Modified - + Darrera modificació Created - + Creat Legacy Browser Integration