From f89e6d4e6a7da68be618020109c98b1a9a6be1db Mon Sep 17 00:00:00 2001 From: ghidra1 Date: Tue, 29 Sep 2026 11:56:09 -0400 Subject: [PATCH 1/2] GP-1 Adjusted load trust store error reporting --- .../main/java/ghidra/net/DefaultTrustManagerFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/net/DefaultTrustManagerFactory.java b/Ghidra/Framework/Generic/src/main/java/ghidra/net/DefaultTrustManagerFactory.java index 070a2c2351..87c8c28282 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/net/DefaultTrustManagerFactory.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/net/DefaultTrustManagerFactory.java @@ -538,8 +538,8 @@ public class DefaultTrustManagerFactory { } catch (Exception e) { wrappedTrustManager.caError = e; - Msg.error(DefaultTrustManagerFactory.class, - "OS trust store load failed: " + e.getMessage()); + Msg.warn(DefaultTrustManagerFactory.class, + "OS Truststore load failed: " + e.getMessage()); } } @@ -575,7 +575,7 @@ public class DefaultTrustManagerFactory { } } } - throw new KeyStoreException("X509 CA certificates not found"); + throw new KeyStoreException("X509 trusted CA certificates not found"); } } From 70e7c708734596f2a42b81bcc8fcae6f8aca7172 Mon Sep 17 00:00:00 2001 From: dev747368 <48332326+dev747368@users.noreply.github.com> Date: Wed, 23 Sep 2026 20:05:50 +0000 Subject: [PATCH 2/2] GP-7234 check size of coff archive member --- .../bin/format/coff/archive/CoffArchiveMemberHeader.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveMemberHeader.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveMemberHeader.java index 9f708b361c..dfa1c47b7a 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveMemberHeader.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/coff/archive/CoffArchiveMemberHeader.java @@ -62,7 +62,7 @@ public class CoffArchiveMemberHeader implements StructConverter { * @param longNames optional, string table with long file names (only present in some * COFF ar formats) * @return a new {@link CoffArchiveMemberHeader} - * @throws IOException + * @throws IOException if error reading fields */ public static CoffArchiveMemberHeader read(BinaryReader reader, LongNamesMember longNames) throws IOException { @@ -138,6 +138,9 @@ public class CoffArchiveMemberHeader implements StructConverter { long size; try { size = Long.parseLong(sizeStr); + if (size < 0) { + throw new IOException("Invalid CoffArchiveMember size string: " + sizeStr); + } } catch ( NumberFormatException nfe ) { throw new IOException("Bad size value: " + sizeStr); } @@ -145,6 +148,9 @@ public class CoffArchiveMemberHeader implements StructConverter { if (name.startsWith("#1/")) { try { int nameLen = Integer.parseInt(name.substring(3)); + if (nameLen > size) { + throw new IOException("Bad CoffArchiveMember #1 name length: " + name); + } // name seems to be padded with trailing nulls to put payload at aligned offset name = reader.readAsciiString(payloadOffset, nameLen); size -= nameLen;