Only run findVarHandleMethodRefs when _buildResult is OK

If we return with a failure from computeConstantPoolMapAndSizes, we should not call findVarHandleMethodRefs (uses uninitialized data). Signed-off-by: Bjørn Vårdal <[email protected]>
ncough · Oct 17, 2017 · 47eac2e · 47eac2e
1 parent adf35c9
commit 47eac2e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/runtime/bcutil/ClassFileOracle.cpp b/runtime/bcutil/ClassFileOracle.cpp
@@ -240,10 +240,12 @@ ClassFileOracle::ClassFileOracle(BufferManager *bufferManager, J9CfrClassFile *c
 		_constantPoolMap->computeConstantPoolMapAndSizes();
 		if (!constantPoolMap->isOK()) {
 			_buildResult = _constantPoolMap->getBuildResult();
-		}
-		_constantPoolMap->findVarHandleMethodRefs();
-		if (!constantPoolMap->isOK()) {
-			_buildResult = _constantPoolMap->getBuildResult();
+		} else {
+			/* computeConstantPoolMapAndSizes must complete successfully before calling findVarHandleMethodRefs */
+			_constantPoolMap->findVarHandleMethodRefs();
+			if (!constantPoolMap->isOK()) {
+				_buildResult = _constantPoolMap->getBuildResult();
+			}
 		}
 	}