You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2022/03/20 10:07:45 UTC

[karaf] branch karaf-4.3.x updated: [KARAF-7404] Avoid NPE in JaasHelper

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch karaf-4.3.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.3.x by this push:
     new c12d99b  [KARAF-7404] Avoid NPE in JaasHelper
c12d99b is described below

commit c12d99bc3fe02312ba2295d7daff123d710b2ad0
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sat Mar 19 15:22:44 2022 +0100

    [KARAF-7404] Avoid NPE in JaasHelper
    
    (cherry picked from commit 898d0d502f36fd00adef6a8c8311bc5a972cccc4)
---
 util/src/main/java/org/apache/karaf/util/jaas/JaasHelper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/util/src/main/java/org/apache/karaf/util/jaas/JaasHelper.java b/util/src/main/java/org/apache/karaf/util/jaas/JaasHelper.java
index 983df31..e9df824 100644
--- a/util/src/main/java/org/apache/karaf/util/jaas/JaasHelper.java
+++ b/util/src/main/java/org/apache/karaf/util/jaas/JaasHelper.java
@@ -134,7 +134,9 @@ public class JaasHelper {
             for (int i = 0; i < cLen; i++) {
                 newDomains[i] = new DelegatingProtectionDomain(currentDomains[i], principals);
             }
-            System.arraycopy(assignedDomains, 0, newDomains, cLen, aLen);
+            if (assignedDomains != null) {
+                System.arraycopy(assignedDomains, 0, newDomains, cLen, aLen);
+            }
             return optimize(newDomains);
         }