From 264d598653e1d7325867479097aa385469fc32f0 Mon Sep 17 00:00:00 2001
From: James <49045138+ghidracadabra@users.noreply.github.com>
Date: Fri, 14 Feb 2025 20:52:50 +0000
Subject: [PATCH] GP-5353 dwarf line number fix

---
 .../bin/format/dwarf/line/DWARFLineProgramExecutor.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/line/DWARFLineProgramExecutor.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/line/DWARFLineProgramExecutor.java
index adbf472ce6..72f0c5d707 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/line/DWARFLineProgramExecutor.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/dwarf/line/DWARFLineProgramExecutor.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.
@@ -244,7 +244,7 @@ public final class DWARFLineProgramExecutor implements Closeable {
 			case DW_LNS_const_add_pc: {
 				int adjustedOpcode = 255 - opcodeBase;
 				int addressIncrement = adjustedOpcode / lineRange;
-				state.address += (addressIncrement & 0xff);
+				state.address += minInstrLen * (addressIncrement & 0xff);
 				break;
 			}
 			case DW_LNS_fixed_advanced_pc: {