Do not crash when trying to parse "nil" XML file (bsc#1176593)

yast · Sep 24, 2020 · 7bec740 · 7bec740
1 parent f013a5f
commit 7bec740
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/library/control/src/modules/WorkflowManager.rb b/library/control/src/modules/WorkflowManager.rb
@@ -1231,6 +1231,8 @@ def WorkflowRequiresRegistration(src_id)
     end
 
     def IncorporateControlFileOptions(filename)
+      return false if filename.nil?
+
       begin
         update_file = XML.XMLToYCPFile(filename)
       rescue RuntimeError => e

diff --git a/library/xml/src/modules/XML.rb b/library/xml/src/modules/XML.rb
@@ -165,7 +165,7 @@ def YCPToXMLString(doc_type, contents)
     # @return [Hash] parsed content
     # @raise [XMLDeserializationError] when non supported XML is passed
     def XMLToYCPFile(xml_file)
-      raise XMLDeserializationError, "Cannot find XML file" if SCR.Read(path(".target.size"), xml_file) <= 0
+      raise XMLDeserializationError, "Cannot find XML file" if xml_file.nil? || SCR.Read(path(".target.size"), xml_file) <= 0
 
       log.info "Reading #{xml_file}"
       XMLToYCPString(SCR.Read(path(".target.string"), xml_file))

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 24 07:25:01 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
+
+- Do not crash when trying to parse non-existing ("nil") add-on
+  product control XML file (bsc#1176593)
+- 4.3.30
+
 -------------------------------------------------------------------
 Wed Sep 23 13:21:38 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.3.29
+Version:        4.3.30
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only