summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-10-21 22:08:21 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2022-03-03 13:38:06 +0100
commit44bdbe696bc3dc733fd95fc6320ceee22e6f20a5 (patch)
tree6cf09b3837bdd9a0244d29b3cf51bbf6cc4d664d
parentf02a24ef1922d7c90d427ae3ac6babb36f26b059 (diff)
tdf#120703 (PVS): redundant nullptr check
V668 There is no sense in testing the 'hdo' pointer against null, as the memory was allocated using the 'new' operator. The exception will be generated in the case of memory allocation error. Change-Id: Ic889dcba4e9d77a6dd27dd1603ed37d39e9fe581 Reviewed-on: https://gerrit.libreoffice.org/62152 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 2f6d20d4ff8a308979f84d823211408363502fac)
-rw-r--r--hwpfilter/source/drawing.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index 806a48748bf7..c720c3b947ff 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -374,16 +374,13 @@ static HWPDrawingObject *LoadDrawingObject(void)
// drawing object can be list.
// hdo = current item, head = list;
- if (hdo != nullptr)
+ if (hdo->type < 0 || hdo->type >= HWPDO_NITEMS)
{
- if (hdo->type < 0 || hdo->type >= HWPDO_NITEMS)
- {
- hdo->type = HWPDO_RECT;
- }
-
- HWPDOFunc(hdo, OBJFUNC_FREE, nullptr, 0);
- delete hdo;
+ hdo->type = HWPDO_RECT;
}
+ HWPDOFunc(hdo, OBJFUNC_FREE, nullptr, 0);
+ delete hdo;
+
if( prev )
{
prev->next = nullptr;