From e51d73197e78ec17c701031afe081b8dec0890f3 Mon Sep 17 00:00:00 2001
From: HisShadow <shadowpilot34@gmail.com>
Date: Wed, 10 Jan 2024 09:54:54 +0300
Subject: [PATCH] fixes for svace errors found

---
 java-17-openjdk.spec |  3 ++-
 svace-fixes.patch    | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 svace-fixes.patch

diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index af39a6f..f80a11a 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -1355,7 +1355,7 @@ Patch2:    rh1648644-java_access_bridge_privileged_security.patch
 Patch3:    rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
 # Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
 Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
-
+Patch7: svace-fixes.patch
 #############################################
 #
 # OpenJDK patches in need of upstreaming
@@ -1769,6 +1769,7 @@ pushd %{top_level_dir_name}
 %patch2 -p1
 %patch3 -p1
 %patch6 -p1
+%patch7 -p1
 # nss.cfg PKCS11 support; must come last as it also alters java.security
 %patch1000 -p1
 popd # openjdk
diff --git a/svace-fixes.patch b/svace-fixes.patch
new file mode 100644
index 0000000..9eec801
--- /dev/null
+++ b/svace-fixes.patch
@@ -0,0 +1,13 @@
+diff --git a/src/java.base/share/classes/sun/security/x509/X509CertImpl.java b/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
+index 254016d..5f11fdc 100644
+--- a/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
++++ b/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
+@@ -749,7 +749,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
+         id = attr.getPrefix();
+ 
+         if (id.equalsIgnoreCase(INFO)) {
+-            if (attr.getSuffix() != null) {
++            if (attr.getSuffix() == null) {
+                 info = null;
+             } else {
+                 info.delete(attr.getSuffix());