diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-15 11:50:47 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-15 13:28:15 +0000 |
| commit | b6842e227d979c24b50fe5971d183f58df4788e3 (patch) | |
| tree | 8965531e4af40806afe19f3e5c32bf70f94a8fef | |
| parent | 8f86674214c9dc755302be163690528104dbc473 (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
Change-Id: Ic19511a3b150f40d3cd9cf66bf9d86c94f3f9187
(cherry picked from commit 3bb28b5aaef5e85a981dc9411db1f05524aeedf6)
Reviewed-on: https://gerrit.libreoffice.org/5436
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -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 b6595a4466d2..51add949a33f 100644 --- a/desktop/source/deployment/misc/dp_version.cxx +++ b/desktop/source/deployment/misc/dp_version.cxx @@ -43,8 +43,8 @@ namespace dp_misc { OUString const & version1, OUString const & version2) { for (::sal_Int32 i1 = 0, i2 = 0; i1 >= 0 || i2 >= 0;) { - OUString e1(getElement(version1, &i1)); - OUString e2(getElement(version2, &i2)); + OUString e1(i1 >= 0 ? getElement(version1, &i1) : OUString()); + OUString e2(i2 >= 0 ? getElement(version2, &i2) : OUString()); if (e1.getLength() < e2.getLength()) { return ::dp_misc::LESS; } else if (e1.getLength() > e2.getLength()) { |