summaryrefslogtreecommitdiffstats
path: root/src/usr/util
diff options
context:
space:
mode:
authorDean Sanner <dsanner@us.ibm.com>2014-04-15 16:06:09 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2014-04-15 21:22:11 -0500
commitb7ed3cfcf41fba0ea8f7f15f4571b228d6ff3550 (patch)
treeb7f0be9df04cae22ec5f8504b7a50290b55ed9cd /src/usr/util
parent6f8d28b459c25d37a42412ea84890c8d41beae24 (diff)
downloadtalos-hostboot-b7ed3cfcf41fba0ea8f7f15f4571b228d6ff3550.tar.gz
talos-hostboot-b7ed3cfcf41fba0ea8f7f15f4571b228d6ff3550.zip
Fix double delete in HBRT
Change-Id: I126ebe43222defccde210ffc603b05dc296781a6 CQ: SW257403 Backport: release-fips810 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10562 Tested-by: Jenkins Server Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/util')
-rw-r--r--src/usr/util/runtime/utillidmgr_rt.C1
-rw-r--r--src/usr/util/utillidmgr.C2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/usr/util/runtime/utillidmgr_rt.C b/src/usr/util/runtime/utillidmgr_rt.C
index c0518befb..b9baf9014 100644
--- a/src/usr/util/runtime/utillidmgr_rt.C
+++ b/src/usr/util/runtime/utillidmgr_rt.C
@@ -92,6 +92,7 @@ errlHndl_t UtilLidMgr::loadLid()
if (l_errl)
{
delete l_errl;
+ l_errl = NULL;
int rc =
g_hostInterfaces->lid_load(iv_lidId, &iv_lidBuffer, &iv_lidSize);
diff --git a/src/usr/util/utillidmgr.C b/src/usr/util/utillidmgr.C
index 2baee4ca3..d553662f5 100644
--- a/src/usr/util/utillidmgr.C
+++ b/src/usr/util/utillidmgr.C
@@ -176,6 +176,7 @@ errlHndl_t UtilLidMgr::getLidSizePnor(size_t& o_lidSize, bool& o_imgInPnor)
{
//Lid not in extended image
delete errl;
+ errl = NULL;
break;
}
@@ -222,6 +223,7 @@ errlHndl_t UtilLidMgr::getLidPnor(void* i_dest,
{
//Lid not in extended image
delete errl;
+ errl = NULL;
break;
}
}
OpenPOWER on IntegriCloud