Fix NPE if child channel has no parent (bsc#1231053)

uyuni-project · Oct 23, 2024 · b65cbd1 · b65cbd1
1 parent 8bb8821
commit b65cbd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java b/java/code/src/com/redhat/rhn/frontend/action/common/DownloadFile.java
@@ -282,7 +282,8 @@ else if (ksession != null) {
 
         if (map.containsKey(CHILD) && !Config.get().getBoolean("ks_restrict_child_channels")) {
             Channel child = ChannelFactory.lookupByLabel(map.get(CHILD));
-            if (child == null || tree == null || !child.getParentChannel().equals(tree.getChannel())) {
+            if (child == null || tree == null || child.getParentChannel() == null ||
+                    !child.getParentChannel().equals(tree.getChannel())) {
                 response.sendError(HttpServletResponse.SC_NOT_FOUND);
                 return mapping.findForward("error");
             }

diff --git a/java/spacewalk-java.changes.mbussolotto.npe_kickstart b/java/spacewalk-java.changes.mbussolotto.npe_kickstart
@@ -0,0 +1 @@
+- Fix NPE if child channel has no parent (bsc#1231053)