diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-31 08:21:11 +0300 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-11-01 20:07:15 +0100 |
| commit | 300ad9206743c8c216a90d7d4d55f5b0477889ad (patch) | |
| tree | 9b673eccc01f73e4c732b74e56d335f91870fbc4 | |
| parent | tdf#151736 writer direct formatting crash (diff) | |
| download | core-300ad9206743c8c216a90d7d4d55f5b0477889ad.tar.gz core-300ad9206743c8c216a90d7d4d55f5b0477889ad.zip | |
tdf#151654 related: dereference after nullptr check
pPV nullptr has appeared in commit 6fcee31ed5e1dadcbf9614967592ff188a250007
Date Thu Jul 02 14:28:15 2009 +0000
CWS-TOOLING: integrate CWS aw065
but it was still dereferenced unconditionally after that.
Change-Id: I4a9ec2345e4093673eed092f6ddb16ee21b9d00f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142054
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 7fc2aefc09956bee0353575d2bacca2d5b556b04)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141929
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | svx/source/svdraw/svdview.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 6179451b9596..d7d6d5d3adeb 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -544,7 +544,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co SdrObjectPrimitiveHit(*pHitObj, aLocalLogicPosition, 0, *pPV, &pPV->GetVisibleLayers(), true)); // TextEdit attached to an object in a locked layer - if (pPV->GetLockedLayers().IsSet(pHitObj->GetLayer())) + if (bTEHit && pPV->GetLockedLayers().IsSet(pHitObj->GetLayer())) { bTEHit=false; } |