Fixed potential unended transaction

astrelsky · May 12, 2021 · fab719e · fab719e
1 parent 3ead0e9
commit fab719e
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/ghidra/app/cmd/data/rtti/gcc/typeinfo/AbstractClassTypeInfoModel.java b/src/main/java/ghidra/app/cmd/data/rtti/gcc/typeinfo/AbstractClassTypeInfoModel.java
@@ -128,8 +128,9 @@ public final boolean isAbstract() {
 	@Override
 	public GhidraClass getGhidraClass() {
 		if (!(namespace instanceof GhidraClass)) {
+			Integer id = null;
+			boolean success = false;
 			try {
-				Integer id = null;
 				if (program.getCurrentTransaction() == null) {
 					id = program.startTransaction("creating GhidraClass for "+getName());
 				}
@@ -139,12 +140,14 @@ public GhidraClass getGhidraClass() {
 					namespace = TypeInfoUtils.getNamespaceFromTypeName(program, typeName);
 					namespace = NamespaceUtils.convertNamespaceToClass(namespace);
 				}
-				if (id != null) {
-					program.endTransaction(id, true);
-				}
+				success = true;
 			} catch (InvalidInputException e) {
 				Msg.error(this, e);
 				return null;
+			} finally {
+				if (id != null) {
+					program.endTransaction(id, success);
+				}
 			}
 		} return (GhidraClass) namespace;
 	}