Skip to content

Commit

Permalink
Regenerate patches
Browse files Browse the repository at this point in the history
  • Loading branch information
ekilmer committed Oct 29, 2024
1 parent 01e8504 commit cd29a01
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions src/patches/HEAD/0001-Fix-UBSAN-errors-in-decompiler.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 692408998944223ca7d531899e2e602bc7dae3fe Mon Sep 17 00:00:00 2001
From 43f6d3300c3f8e519b014fff890450f814c8db34 Mon Sep 17 00:00:00 2001
From: Eric Kilmer <eric.d.kilmer@gmail.com>
Date: Mon, 12 Aug 2024 12:02:35 -0400
Subject: [PATCH 1/3] Fix UBSAN errors in decompiler
Subject: [PATCH 1/4] Fix UBSAN errors in decompiler

Co-authored-by: Alex Cameron <asc@tetsuo.sh>
---
Expand Down Expand Up @@ -233,5 +233,5 @@ index c35bde8774..061e536775 100644
uintb true_result = ((uintb)(int32_t)f) & 0xffffffff;
uintb encoding = format.getEncoding(f);
--
2.46.0
2.47.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b7681c6a2b68b27323bf4ad79fb3501d7f067c4d Mon Sep 17 00:00:00 2001
From d5a7836f29a245845a0225d9aa9ca8332cc60c6c Mon Sep 17 00:00:00 2001
From: Alex Cameron <asc@tetsuo.sh>
Date: Wed, 3 Aug 2022 20:01:18 +1000
Subject: [PATCH 2/3] Use `stroull` instead of `stroul` to parse address
Subject: [PATCH 2/4] Use `stroull` instead of `stroul` to parse address
offsets

---
Expand Down Expand Up @@ -34,5 +34,5 @@ index bda09fc94c..d077ee375e 100644
enddata = (const char *) tmpdata;
if (enddata - s.c_str() == s.size()) { // If no size or offset override
--
2.46.0
2.47.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0be97746f512af054a0428cdddb9b6b8445b6ccf Mon Sep 17 00:00:00 2001
From 9a96513822566b201e50ca26a38aaafafc8f4520 Mon Sep 17 00:00:00 2001
From: Eric Kilmer <eric.d.kilmer@gmail.com>
Date: Sat, 30 Mar 2024 18:46:16 -0400
Subject: [PATCH 3/3] Add missing index check to prevent errors in Windows
Subject: [PATCH 3/4] Add missing index check to prevent errors in Windows

Not sure why this only appears when testing on Windows.
---
Expand All @@ -22,5 +22,5 @@ index 0237adb820..5048a9d480 100644
if (i == dcp->fd->numCalls())
throw IfaceExecutionError("No call is made at this address");
--
2.46.0
2.47.0

Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From b341ea2dda57050343de4a52602541c754df076d Mon Sep 17 00:00:00 2001
From 7321d6fa0d5098f0f0db17ec8c37ff35f59be688 Mon Sep 17 00:00:00 2001
From: Eric Kilmer <eric.d.kilmer@gmail.com>
Date: Tue, 29 Oct 2024 15:30:57 -0400
Subject: [PATCH] Use string resize instead of reserve
Subject: [PATCH 4/4] Use string resize instead of reserve

assign will fix up the size to hold all of what's copied
---
Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc
index 5f5fa0c7b3..4cd77156f2 100644
index 193c2db051..5c9f25b57c 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/stringmanage.cc
@@ -67,7 +67,6 @@ void StringManager::assignStringData(StringData &data,const uint1 *buf,int4 size
Expand Down

0 comments on commit cd29a01

Please sign in to comment.