summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-10-07openssl 1.0.2tdistro/collabora/cp-5.3Andras Timar1-2/+2
Change-Id: Ideb980a07632e75e2bc7fffa851b8419e727c13b
2019-08-23build fixcp-5.3-66Andras Timar1-2/+2
Change-Id: Iecb4be601fe1cb4d3774795be66a1a0f8c33ca3b
2019-08-23build fixAndras Timar1-1/+1
Change-Id: I82ae070fd1597fcdeae420b28f506347eb47b005
2019-08-23ofz#4436 check if seek succeededCaolán McNamara2-2/+5
Change-Id: I56d9692647b28c706b56ccacf08d494b3d830d94 Reviewed-on: https://gerrit.libreoffice.org/45296 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 765ff606426251f90aff5d1fc89f01ed7594ed59)
2019-08-23limit symbol visibilityCaolán McNamara1-3/+6
Change-Id: I54d5fbe1cd9d5ae94cb134f08fc00593c802ebee (cherry picked from commit 79890a6d1bccbba8c40e42566c3d437d7a1aaace)
2019-08-23check escher seeksCaolán McNamara1-7/+11
Change-Id: I4cb523e8654defa25e75ebd54f1e125ea02e1cf9 Reviewed-on: https://gerrit.libreoffice.org/36281 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a1147a34d85742fd5d9410efac6fc59ac2fd1574)
2019-08-23build fixAndras Timar1-1/+1
Change-Id: Ic0be0c6fd0d498b3f0512461480f166ad3f7b5f8
2019-08-23Bump version to 5.3-66Andras Timar1-1/+1
Change-Id: Ibd4ee1aba3c4c48d9d8c12897331404a2790b9eb
2019-08-22construct final url from parsed outputCaolán McNamara1-2/+10
Change-Id: Ifd733625a439685ad307603eb2b00bf463eb9ca9 Reviewed-on: https://gerrit.libreoffice.org/77373 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 87959e5deea6d33cd35dbb3b8423056f9566710e) Reviewed-on: https://gerrit.libreoffice.org/77377 (cherry picked from commit c03acb9b8a97254cfcf7c45ef920b93b7f1dd344)
2019-08-22expand pyuno path separatorsCaolán McNamara1-1/+2
Change-Id: Ic97649ed6d4be595b308922c7bdc880cbb60b239 Reviewed-on: https://gerrit.libreoffice.org/77102 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 75903a0298218f89a199a5ac151ee0166f4469d7)
2019-08-22Properly obtain locationStephan Bergmann2-11/+19
Reviewed-on: https://gerrit.libreoffice.org/77019 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a9cde2557242a0c343d99533f3ee032599c66f42) Reviewed-on: https://gerrit.libreoffice.org/77023 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 28c6af3ddc283ca9c5712359a9abcb385c1575b4) Change-Id: I9fb0d883a3623394343cd54ef61e5610544198c8
2019-08-22keep name percent-encodedStephan Bergmann1-1/+3
Change-Id: I470c4b24192c3e3c9b556a9bbb3b084359e0033b Reviewed-on: https://gerrit.libreoffice.org/77006 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 315c51731384230194af26b86a976bf5d06c9dcc)
2019-08-22Postpone loading of all external references, including INDIRECT()Eike Rathke1-18/+36
... which can be constructed with an arbitrary URI text string not an svExternal* token type, until link updates are allowed. Reviewed-on: https://gerrit.libreoffice.org/75422 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit b824b23860b2cf533d4f2428d4a750bd72576181) Reviewed-on: https://gerrit.libreoffice.org/76304 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Change-Id: I2ce4de415ff99ace04c083c36c1383d76a4ef40d (cherry picked from commit 31b1d2af8ce01804049168b7b0317d93d77a42d7) (cherry picked from commit e374cd045665226e0af82e1ba787bcb2a3879d31)
2019-08-22Postpone filter detection until link update is allowedMike Kaganski1-7/+16
Change-Id: I85b2185e550f2a133ceb485241ef513b40593e34 Reviewed-on: https://gerrit.libreoffice.org/75301 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 03c708bf085f91480c014d7fa31e7a317b2c7b8f) Reviewed-on: https://gerrit.libreoffice.org/76303 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 43bf332aeede732557378e81765f29b704b17188) (cherry picked from commit 73176974d613b01bdf5223b93cf2705d3fd8c155)
2019-08-22decode url escape codes and check each path segmentCaolán McNamara1-1/+28
Change-Id: Ie8f7cef912e8dacbc2a0bca73534a7a242a53ca1 Reviewed-on: https://gerrit.libreoffice.org/76378 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins (cherry picked from commit 7942929685fafb0f9c82feb8da7279e5103c87f0) Reviewed-on: https://gerrit.libreoffice.org/76451 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit aab62f2b21c331ff8c31b7c856d5e59080b9d64a) (cherry picked from commit 3098810911ccf76da1591d8f6cfceebfda13dcbd)
2019-08-22expand LibreLogo check to global eventsCaolán McNamara3-11/+15
Reviewed-on: https://gerrit.libreoffice.org/76189 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4a66c7eda6ccde26a42c4e31725248c59940255d) Change-Id: I7f436983ba0eb4b76b02d08ee52626e54b103d5f Reviewed-on: https://gerrit.libreoffice.org/76305 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit b14742734481ae0a4731989a99db487d8ae1986a) (cherry picked from commit 139d6207488d5e9ae7904f9ea07f058c531898ef)
2019-08-22ofz#10198 reset uncommitted fly stuff & pams before applying redliningCaolán McNamara1-0/+3
Change-Id: I2a2587ec4590926f7cffc2a4d58a22d9d5f19c99 Reviewed-on: https://gerrit.libreoffice.org/59947 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 887ee9111f42847406c5ffc85a0ba635080de3de)
2019-08-22ofz#9908 validate no negative editengine selection positionsCaolán McNamara1-1/+3
Change-Id: I37dace2051518224c55756362facd3edba4a9571 Reviewed-on: https://gerrit.libreoffice.org/59059 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit ca3038a05188084b012dd3c799494f30bc5c47ef)
2019-08-22ofz#4837 Null-dereference READCaolán McNamara1-0/+11
Change-Id: I7e4cb934aeac32fa1170beb116e4600b5eb9389a Reviewed-on: https://gerrit.libreoffice.org/47197 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9f8dd17b1e6ab5d5d07b61e0f85edea233f03d71)
2019-08-22sw: fix use after free on tdf117215-1.odtMichael Stahl2-1/+3
Move the fix from 6d0ea082889c89eb8b408779f2de08da7441ff54 to SwFlyFrame::DestroyImpl() so we unregister every SwFlyFrame. ==1550==ERROR: AddressSanitizer: heap-use-after-free on address 0x615000383f56 at pc 0x7efcd70d5ab9 bp 0x7ffeb7ac7c40 sp 0x7ffeb7ac7c38 WRITE of size 1 at 0x615000383f56 thread T0 0 SwAnchoredObject::SetTmpConsiderWrapInfluence(bool) sw/source/core/layout/anchoredobject.cxx:743:32 1 SwObjsMarkedAsTmpConsiderWrapInfluence::Clear() sw/source/core/layout/objstmpconsiderwrapinfl.cxx:53:23 2 SwLayouter::ClearObjsTmpConsiderWrapInfluence(SwDoc const&) sw/source/core/layout/layouter.cxx:387:84 3 sw::DocumentLayoutManager::ClearSwLayouterEntries() sw/source/core/doc/DocumentLayoutManager.cxx:497:5 4 sw::DocumentStateManager::SetModified() sw/source/core/doc/DocumentStateManager.cxx:45:39 5 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3942:36 0x615000383f56 is located 342 bytes inside of 504-byte region [0x615000383e00,0x615000383ff8) freed by thread T0 here: 1 SwFlyAtContentFrame::~SwFlyAtContentFrame() sw/source/core/inc/flyfrms.hxx:159:7 2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9 3 SwFrameFormat::DelFrames() sw/source/core/layout/atrfrm.cxx:2624:17 4 SwUndoFlyBase::DelFly(SwDoc*) sw/source/core/undo/undobj1.cxx:161:19 5 SwUndoDelLayFormat::SwUndoDelLayFormat(SwFrameFormat*) sw/source/core/undo/undobj1.cxx:403:5 6 SwHistoryTextFlyCnt::SwHistoryTextFlyCnt(SwFrameFormat*) sw/source/core/undo/rolbck.cxx:538:20 7 SwHistory::Add(SwFlyFrameFormat&, unsigned short&) sw/source/core/undo/rolbck.cxx:1083:50 8 SwUndoSaveContent::DelContentIndex(SwPosition const&, SwPosition const&, DelContentType) sw/source/core/undo/undobj.cxx:1020:39 9 SwUndoDelete::SwUndoDelete(SwPaM&, bool, bool) sw/source/core/undo/undel.cxx:229:9 11 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3939:55 Change-Id: Ia0c28c9d5792615cbb566e502374efd0f4056daf Reviewed-on: https://gerrit.libreoffice.org/75857 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit dea72ef111ee8a0b1b178f8cd48757514d5ca831) Reviewed-on: https://gerrit.libreoffice.org/75941 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4b9324b93dcbd72c8c8949309d45790dd8f7d5fd)
2019-08-22forcepoint73 deleted SwAnchoredObject still referenced in TmpConsiderWrapInflCaolán McNamara7-19/+43
Reviewed-on: https://gerrit.libreoffice.org/58760 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6d0ea082889c89eb8b408779f2de08da7441ff54) Reviewed-on: https://gerrit.libreoffice.org/58768 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit de765158b372d5f7bbb1b37c7d6be695ab6104ac) Change-Id: If255723834d049865fcf6fd0eac7768dfcbad2a1
2019-08-22Resolves: tdf#124142 don't deref nullptrCaolán McNamara1-1/+2
Change-Id: Ie14600e9f9a1e1c4e99c7a872f5d677453481888 Reviewed-on: https://gerrit.libreoffice.org/69666 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ac7ce7a64ef903bad1476f5635a7b2a1e951a7a3) Reviewed-on: https://gerrit.libreoffice.org/69694 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit cdef6e5f4053adf5413781a9282285eab3923373)
2019-08-22fix assert seen on opening attachment from tdf#123163Caolán McNamara1-1/+2
I imagine it should have been seqPos-(idPos+2) seems to be like this since the initial commit of commit 091fe76b6329b4bb974987554369cbfadd8f2401 Date: Tue Jun 30 12:55:18 2015 +0300 tdf#87348 implement mso-next-textbox vml-style textbox chaining import Change-Id: Ic2f527ede2102c01c8589d58d8c705d59b0a6ffe Reviewed-on: https://gerrit.libreoffice.org/67454 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 45510866fedac63014a3120a1130dbea9fd803ee)
2019-08-22crashtesting: bubble surface creation failure notification upwardsCaolán McNamara1-0/+5
e.g. on converting moz858095-2.svg to odg Change-Id: I1a222f1745cff9c4cb225f6c0c216072fb17b4f7 Reviewed-on: https://gerrit.libreoffice.org/58587 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit dbf34be458a2b5723084d1ed99390b744cee6053)
2019-08-22tdf#121005 forcepoint#44 merge into isDeleteForbiddenCaolán McNamara2-2/+2
Reviewed-on: https://gerrit.libreoffice.org/55355 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c6222fb6b8b429fa2e767c73ad616147f95ab1b9) Change-Id: If7ce44786975c5f9bdc9e64d16274728b03bed32 Reviewed-on: https://gerrit.libreoffice.org/62629 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit ba4861a0dfdf97448925130995d69b4c516f0644)
2019-08-22forcepoint#39 bad layoutCaolán McNamara3-0/+3
reproducible with ./instdir/program/soffice.bin --headless --convert-to pdf sw/qa/core/data/ww8/pass/forcepoint-layout-1.doc Change-Id: I93bd8a75196ddb2a1a242752bb1e06164bf7148e Reviewed-on: https://gerrit.libreoffice.org/53002 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2a957e408530cd16526d793c87f0e6fd4bed1548)
2019-08-22ofz#10879 stay inside sSecStr boundsCaolán McNamara1-2/+2
Change-Id: I0ca70cdb9b80305c5339668d65d2c4c9977e7160 Reviewed-on: https://gerrit.libreoffice.org/61605 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit b3b52643983ec28838eeeed9f841b0918dc745be)
2019-08-22ofz#10395 Null-dereferenceCaolán McNamara1-5/+8
Reviewed-on: https://gerrit.libreoffice.org/60559 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 07b3bfb125fae70e0ab796a929a4f2abe4937912) Reviewed-on: https://gerrit.libreoffice.org/60564 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit fde33870d6989efeb59355aad1209a7f50e7ecf6) Change-Id: I7bde5987a51949d60174335327652186e0ad8998
2019-08-22ofz#10056 Null derefCaolán McNamara1-6/+14
Change-Id: I9ea0f272d0a8b13fb51fec55ac57adca47cafc77 Reviewed-on: https://gerrit.libreoffice.org/59601 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 48c677d55330ac6caf0065fa1776c985b876eead)
2019-08-22ofz#10045 Null derefCaolán McNamara1-2/+5
Change-Id: If9c8edd94b02240510325d6c9c0fc7584ba89b5f Reviewed-on: https://gerrit.libreoffice.org/59574 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit fabac301a2c431a51bcae435e7ad87c843331877)
2019-08-22tdf#117086 crash on deleted SwFootnoteBossFrameCaolán McNamara1-0/+4
use SwFrameDeleteGuard to lock pOldBoss to exist over the range its directly accessed Change-Id: I68af80114a380f68b86cbc78278fb9e5e87cccce Reviewed-on: https://gerrit.libreoffice.org/59113 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit d1b9cbe749fc3329bda1e8ddaee6d8a6f783ad82)
2019-08-22ofz#9934 null derefCaolán McNamara2-2/+3
Change-Id: I6833ad8a556b561a37e468da8845914cabfac4c5 Reviewed-on: https://gerrit.libreoffice.org/59249 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 4fb7390956a193e00c1b599129b89933c41f98ae)
2019-08-22tdf#119224 start and end are expected to exist for the scope of this functionCaolán McNamara1-3/+5
Reviewed-on: https://gerrit.libreoffice.org/59179 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 81818670fe90fca438dfb0c22903474745112cfe) Change-Id: I771bce68a2ac923af6a7d54646a2c59ce6f10f7e
2019-08-22ofz#9892 Null-dereferenceCaolán McNamara1-1/+3
Change-Id: I8ab1948e5760da365bdddaf45955912a18b20ead Reviewed-on: https://gerrit.libreoffice.org/59056 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit a0aea0b22a5ceb31b69407be6b74506194d44134)
2019-08-22crashtesting: empty B2DRange range turned into oversized RectangleCaolán McNamara1-0/+3
with document ooo47086-1.xls Reviewed-on: https://gerrit.libreoffice.org/58921 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit eabb2bf06aba0de81a6d1e7715859fa63379325b) Change-Id: Ia43b6b3e3951875280892138c7068348f1b56a7c
2019-08-22forcepoint#55 invalid iterator incrementCaolán McNamara1-0/+2
Change-Id: I151602f645a48404d93e0ae64a9e1d2a6ba2bc4b Reviewed-on: https://gerrit.libreoffice.org/58386 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 26300f5d4c4e6241baf8cadcfea094e7969814a5)
2019-08-22forcepoint#57 sanity check stream signature sizeCaolán McNamara1-13/+17
Change-Id: I5ae459e159a64f32c62278a87e37deb08ab9d6ac Reviewed-on: https://gerrit.libreoffice.org/58448 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 8ed224599ae7985b577f0bf737b2b9b2e8dd47b7)
2019-08-22forcepoint#64 null derefCaolán McNamara1-1/+1
Change-Id: I4acf03a7911aa203fc4ef10b6a96b0135d6adbbc Reviewed-on: https://gerrit.libreoffice.org/58415 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit a5b84a6888deaa406786b350a0adcf9ef9020f48)
2019-08-22forcepoint#63 null derefCaolán McNamara1-1/+1
Change-Id: Ib22ff870cd0d8cdd2350b2aa8698f5a2e3866bdc Reviewed-on: https://gerrit.libreoffice.org/58411 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 9a0e5aeca5a118e748e625f6ecbd49a497b8e232)
2019-08-22forcepoint#62 null derefCaolán McNamara1-2/+2
Change-Id: I255aeb96c3763aa106128d3463e4fd55395ef8b8 Reviewed-on: https://gerrit.libreoffice.org/58409 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 9e434f2f5ad61092ee685369bce93d90a28db149)
2019-08-22forcepoint#58 null derefCaolán McNamara1-0/+2
Change-Id: I826890ec85a16bc05fc1e4cd068079b0f8734d07 Reviewed-on: https://gerrit.libreoffice.org/58394 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 8cee73aae9bca3a94aa7a0aa3bfa82b593d4c3c7)
2019-08-22forcepoint#56 null derefCaolán McNamara1-6/+8
Change-Id: Iaa9c4d6901a340145412fa46eaf5c292c3fb62e8 Reviewed-on: https://gerrit.libreoffice.org/58387 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 0845c1a74aef650b4aebaeea9587b3bfb5b38ffb)
2019-08-22forcepoint#45 object may not be a EMFPPenCaolán McNamara1-1/+1
Change-Id: Ifb5c17e13faf6e9d246e1668ef7916957a5296b6 Reviewed-on: https://gerrit.libreoffice.org/55679 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit d5db9b8a8f99bed76c9a3e195a28049d677610a9)
2019-08-22ofz#7322 lcl_MarkEqualByStart sort logic differs from that of operator==Caolán McNamara2-1/+8
when it encounters a SwPosition with a SwIndex nContent whose m_pIndexReg is null and compares to one whose m_pIndexReg is not null, where both have an m_nIndex of 0. operator== considers them different, while lcl_MarkEqualByStart doesn't care and sorts them as equal Change-Id: I29920b98c9e6f395487de1b9cafa6b1282b2b1b6 Reviewed-on: https://gerrit.libreoffice.org/54342 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit b3aece104b886618552828c168a1b51b3290f38f)
2019-08-22Related: ofz#8226 + valgrind: uninitialized valueCaolán McNamara1-2/+2
Change-Id: I63dea876dffe2d9e17b506dbd8515da2d97fbf08 Reviewed-on: https://gerrit.libreoffice.org/54114 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 0ec74577a97ca51d50e0f3782c289c95c6430641)
2019-08-22forcepoint #27 check region bands loaded from stream for consistencyCaolán McNamara3-6/+32
Reviewed-on: https://gerrit.libreoffice.org/51145 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 2a63eb8ba642b58814f8a78ba65a2c537aa97cdf) Change-Id: I92376b5fb4208c78fa25a94d4dd394256793161c
2019-08-22forcepoint #21 pop on empty stackCaolán McNamara2-1/+1783
Thanks to Antti Levomäki and Christian Jalio from Forcepoint. Reviewed-on: https://gerrit.libreoffice.org/51115 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 3686a3fc1b2eaee53b1ab32f33455b2b37aa8c6e) Change-Id: I25b1c6361fb0a3ae6b01f2be870c9e1b49bf5b84
2019-08-22tdf#114536 sw: fix use-after-free in SwTextFormatter::MergeCharacterBorder()Miklos Vajna3-0/+22
SwTextFormatter::Underflow() truncated a line portion, which deletes the rest of the line portions, but left m_pFirstOfBorderMerge unchanged, leading to a crash when SwTextFormatter::MergeCharacterBorder() tried to access it. Fix the problem by updating the non-owning m_pFirstOfBorderMerge accordingly when truncating the line portion. (cherry picked from commit ecd855794b22c0f7e6fb2f362b566c4d9c5f624a) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Reviewed-on: https://gerrit.libreoffice.org/47989 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 968348dfe3f151ee41163006e7748777a0379e65) Change-Id: I5e445bbe2424d70d60c363fa4e3a00636e282325
2019-08-22ofz#4518 sw: why do we need to set IgnoreDeleteRedlinesMichael Stahl1-4/+0
This mysterious IgnoreDeleteRedlines flag was set in this particular case of a new DELETE redline inside or equal to an existing INSERT redline since initial import. Why it's needed is documented nowhere. If it is needed, then i'm assuming it's only needed to prevent deleting redlines that are actually in the pNewRedl range; it makes no sense to prevent deletion of redlines inside a footnote when that footnote is deleted, because there is no valid position left for such redlines. The problem here is that in the range that is deleted there is a footnote and there is another redline inside the footnote text and that has its positions corrected rather ridiculously by DelBookmarks() because DeleteRedline() ignored it due to the flag. Remove the call to MaybeNotifyRedlineModification(), to fix a SwTiledRenderingTest::testRedlineUpdateCallback failure, assuming that it is only called to compensate for the flag being set, seeing as this is the only such call in AppendRedline. Reviewed-on: https://gerrit.libreoffice.org/46016 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 0999ac11796d2f2c7439df8c5f65d73119716a7d) Reviewed-on: https://gerrit.libreoffice.org/46513 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 33efb8806ea16bcc140f084503ef1c9e49a844f8) Change-Id: I0f266213b8525f7bee06ee0d56290f4524bf0d85
2019-08-22tdf#114304 break rather than return false on dodgy record lengthCaolán McNamara1-1/+4
Change-Id: I1bc8c400147beb8688ed3afd7402b3d3f68a4a3a Reviewed-on: https://gerrit.libreoffice.org/46044 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c8b76656c46d0d455393faec8d54f3a12c5ec617)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 04:59:26 +0000