From 44bdbe696bc3dc733fd95fc6320ceee22e6f20a5 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Sun, 21 Oct 2018 22:08:21 +0200 Subject: 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 (cherry picked from commit 2f6d20d4ff8a308979f84d823211408363502fac) --- hwpfilter/source/drawing.h | 13 +++++-------- 1 file 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; -- cgit