From f17462390d9ba866f76207839ff996896d0a9af5 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 6 Jun 2017 14:12:00 +0200 Subject: libstaroffice: use correct loop index (cherry picked from commit cc2db25645ede743bdc3824fe7d26ea4beda6a96) Signed-off-by: David Tardon Change-Id: I1b862ed2d69c41361bc8c26d96c5329473fe64aa Reviewed-on: https://gerrit.libreoffice.org/38444 Tested-by: Jenkins Reviewed-by: Markus Mohrhard --- .../0001-ofz-1029-use-correct-loop-index.patch.1 | 27 ++++++++++++++++++++++ .../libstaroffice/UnpackedTarball_libstaroffice.mk | 1 + 2 files changed, 28 insertions(+) create mode 100644 external/libstaroffice/0001-ofz-1029-use-correct-loop-index.patch.1 diff --git a/external/libstaroffice/0001-ofz-1029-use-correct-loop-index.patch.1 b/external/libstaroffice/0001-ofz-1029-use-correct-loop-index.patch.1 new file mode 100644 index 000000000000..f004e5674da6 --- /dev/null +++ b/external/libstaroffice/0001-ofz-1029-use-correct-loop-index.patch.1 @@ -0,0 +1,27 @@ +From 2d6253c7a692a3d92785dd990fce7256ea05e794 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Fri, 7 Apr 2017 19:28:55 +0200 +Subject: [PATCH] ofz#1029 use correct loop index + +To be honest, I think this would be clearer as two separate reads to two +separate vars... +--- + src/lib/StarWriterStruct.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/StarWriterStruct.cxx b/src/lib/StarWriterStruct.cxx +index 5893302..d1ad366 100644 +--- a/src/lib/StarWriterStruct.cxx ++++ b/src/lib/StarWriterStruct.cxx +@@ -327,7 +327,7 @@ bool DatabaseName::read(StarZone &zone) + } + data.m_name=libstoff::getString(text); + int positions[2]; +- for (int j=0; j<2; ++j) positions[i]=int(input->readULong(4)); ++ for (int j=0; j<2; ++j) positions[j]=int(input->readULong(4)); + data.m_selection=STOFFVec2i(positions[0],positions[1]); + m_dataList.push_back(data); + } +-- +2.13.0 + diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk index 957c11859ac5..41e7c63983e8 100644 --- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk +++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk @@ -37,6 +37,7 @@ endif $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1 \ + external/libstaroffice/0001-ofz-1029-use-correct-loop-index.patch.1 \ )) # vim: set noet sw=4 ts=4: -- cgit v1.2.1