summaryrefslogtreecommitdiff
path: root/reportbuilder/java
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-01-21 14:47:53 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-01-21 15:15:52 +0000
commit08680c58de1271ce42a72ce4105e5a3337d0498c (patch)
treebc9ad26b3005862cb00d78acb29a870c605064e5 /reportbuilder/java
parent524c99524f15672d402be8cf14a6c8393ad71b54 (diff)
coverity#1326438 Dereference null return value
and coverity#1326439 Dereference null return value Change-Id: Idf7e6f34accfb5d5b98a62f6ad221c325e24586a
Diffstat (limited to 'reportbuilder/java')
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index 8933adf26aa8..5f8b91ccb599 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -109,6 +109,12 @@ public class OfficeGroupLayoutController extends SectionLayoutController
final OfficeGroup group = (OfficeGroup) getElement();
final OfficeGroupSection header = group.getHeader();
+
+ if (header == null)
+ {
+ return controller;
+ }
+
controller.waitForJoin = true;
return processChild(controller, header, getFlowController());
}
@@ -127,6 +133,12 @@ public class OfficeGroupLayoutController extends SectionLayoutController
final OfficeGroup group = (OfficeGroup) getElement();
final OfficeGroupSection footer = group.getFooter();
+
+ if (footer == null)
+ {
+ return controller;
+ }
+
controller.waitForJoin = true;
return processChild(controller, footer, getFlowController());
}