diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-15 11:50:47 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-11-05 11:47:06 +0100 |
| commit | 2e8ddb8f9b11ba0a517770022138d2c4897f7d93 (patch) | |
| tree | dc74ecdee98693600f5be1887d79c0444743db50 /desktop | |
| parent | c4828099bc2336c3f963b913ecddac4c101cddeb (diff) | |
intermittent crash with failed empty response during update check
version1 is empty and version2 is not, so on second segment of version2 the i1
is already -1 from the first segment check -> kaboom
(cherry picked from commit 3bb28b5aaef5e85a981dc9411db1f05524aeedf6)
Change-Id: Ic19511a3b150f40d3cd9cf66bf9d86c94f3f9187
Reviewed-on: https://gerrit.libreoffice.org/5437
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/misc/dp_version.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx index 04b835515e3d..9cebfce3c8b0 100644 --- a/desktop/source/deployment/misc/dp_version.cxx +++ b/desktop/source/deployment/misc/dp_version.cxx @@ -43,8 +43,8 @@ namespace dp_misc { ::rtl::OUString const & version1, ::rtl::OUString const & version2) { for (::sal_Int32 i1 = 0, i2 = 0; i1 >= 0 || i2 >= 0;) { - ::rtl::OUString e1(getElement(version1, &i1)); - ::rtl::OUString e2(getElement(version2, &i2)); + ::rtl::OUString e1(i1 >= 0 ? getElement(version1, &i1) : ::rtl::OUString()); + ::rtl::OUString e2(i2 >= 0 ? getElement(version2, &i2) : ::rtl::OUString()); if (e1.getLength() < e2.getLength()) { return ::dp_misc::LESS; } else if (e1.getLength() > e2.getLength()) { |