From 05955379621aba00fd371e4feab0f75d074fa9f8 Mon Sep 17 00:00:00 2001
From: caheckman <48068198+caheckman@users.noreply.github.com>
Date: Wed, 21 Aug 2019 13:42:14 -0400
Subject: [PATCH] Original segmented address parsing exceptions

---
 .../program/model/address/SegmentedAddressSpace.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/SegmentedAddressSpace.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/SegmentedAddressSpace.java
index cba303b183..0e57167ea4 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/SegmentedAddressSpace.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/address/SegmentedAddressSpace.java
@@ -216,9 +216,15 @@ public class SegmentedAddressSpace extends GenericAddressSpace {
 	private SegmentedAddress parseSegmented(String segStr, String offStr)
 			throws AddressFormatException {
 		int seg = -1;
-		int off = -1;
 		try {
 			seg = (int) parseString(segStr);
+		}
+		catch (NumberFormatException e) {
+			return null;
+		}
+
+		int off = -1;
+		try {
 			off = (int) parseString(offStr);
 		}
 		catch (NumberFormatException e) {