Merge remote-tracking branch 'origin/patch'

Ghidra/Features/Base/src/main/java/ghidra/features/base/codecompare/listing/LinearAddressCorrelation.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -82,9 +82,12 @@ public class LinearAddressCorrelation implements ListingAddressCorrelation {
 	private Address normalizeToCodeUnitStart(Side side, Address address) {
 		Listing listing = getListing(side);
 		CodeUnit cu = listing.getCodeUnitContaining(address);
-		Address minAddress = cu.getMinAddress();
-		if (isValidAddress(side, minAddress)) {
-			return minAddress;
+
+		if (cu != null) {
+			address = cu.getMinAddress();
+		}
+		if (isValidAddress(side, address)) {
+			return address;
 		}
 		return null;
 	}