diff options
| author | Zane Shelley <zshelle@us.ibm.com> | 2016-02-23 17:30:34 -0600 |
|---|---|---|
| committer | WILLIAM G. HOFFA <wghoffa@us.ibm.com> | 2016-02-26 08:04:15 -0600 |
| commit | e0d4f2d86a6c40216b6aa219f5e9db3023b9510c (patch) | |
| tree | a0e312e07e4ac23f4071e48ff29251016343211f /src/usr/diag/prdf/common/util/prdfFlyWeightS.C | |
| parent | 8ac257b19539a64d085842e9adc5b2ed541960ad (diff) | |
| download | talos-hostboot-e0d4f2d86a6c40216b6aa219f5e9db3023b9510c.tar.gz talos-hostboot-e0d4f2d86a6c40216b6aa219f5e9db3023b9510c.zip | |
PRD: FlyWeightS function accessing pointer out of memory range
Change-Id: I2b955ba91f6270be4c7dccb4590ccb71d6818928
CQ: SW330258
Backport: release-fips840
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24685
Tested-by: Jenkins Server
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: BENJAMIN J. WEISENBECK <bweisenb@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24732
Tested-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24748
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/diag/prdf/common/util/prdfFlyWeightS.C')
| -rwxr-xr-x | src/usr/diag/prdf/common/util/prdfFlyWeightS.C | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/diag/prdf/common/util/prdfFlyWeightS.C b/src/usr/diag/prdf/common/util/prdfFlyWeightS.C index 1cb310375..1c2e978e5 100755 --- a/src/usr/diag/prdf/common/util/prdfFlyWeightS.C +++ b/src/usr/diag/prdf/common/util/prdfFlyWeightS.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -274,7 +274,7 @@ void FlyWeightS<T,S>::increaseSize() l_merged = false; i_next++; - while ((*i_next == NULL) && (i_next != iv_rows.end())) + while ( (iv_rows.end() != i_next) && (NULL == *i_next) ) i_next++; if (i_next == iv_rows.end()) |
