From e4d6eafb9ef708d8f613ddf622d7194f1d1f3d04 Mon Sep 17 00:00:00 2001
From: John Reiser <jreiser@BitWagon.com>
Date: Thu, 10 Dec 2020 19:56:02 -0800
Subject: [PATCH] Tweak unoptimizeReloc again

	modified:   packer.cpp
---
 src/packer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/packer.cpp b/src/packer.cpp
index 4533c921..8131ffcc 100644
--- a/src/packer.cpp
+++ b/src/packer.cpp
@@ -1030,14 +1030,14 @@ unsigned Packer::unoptimizeReloc(upx_byte **in, upx_byte *image,
                 acc_ua_swab32s(image + jc);
                 if ((unsigned long)(p - (image + jc)) < 4) {
                     // data must not overlap control
-                    p = 4+ image + jc;
+                    p = (4 - 1) + image + jc;  // -1: 'for' also increments
                 }
             }
             else if (bits == 64) {
                 set_be64(image + jc, get_le64(image + jc));
                 if ((unsigned long)(p - (image + jc)) < 8) {
                     // data must not overlap control
-                    p = 8+ image + jc;
+                    p = (8 - 1) + image + jc;  // -1: 'for' also increments
                 }
             }
             else