Merge pull request #1320 from jonstout/nso-link-discovery

wrap load_xml call in eval to prevent crash
GlobalNOC · Aug 12, 2021 · b973da0 · b973da0
2 parents 13a6fbd + 3c0ea0f
commit b973da0
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/perl-lib/OESS/lib/OESS/NSO/Client.pm b/perl-lib/OESS/lib/OESS/NSO/Client.pm
@@ -644,6 +644,7 @@ sub get_vrf_statistics {
             my $err = $self->get_json_errors($result);
             if (defined $err) {
                 &$sub($response, $err);
+                return;
             }
 
             # Extract CLI payload from JSON response and strip leading
@@ -654,7 +655,15 @@ sub get_vrf_statistics {
             $raw_response =~ s/<\/Response>.*\z/<\/Response>/s;
 
             # Parse XMl string and extract statistics
-            my $dom = XML::LibXML->load_xml(string => $raw_response);
+            my $dom;
+            eval {
+                $dom = XML::LibXML->load_xml(string => $raw_response);
+            };
+            if ($@) {
+                $self->{logger}->error("Failed to load XML in get_vrf_statistics: $body");
+                &$sub($response, "$@");
+                return;
+            }
 
             # Lookup Instance named 'default' and get VRFTable from inside
             my $instances = $dom->findnodes('//Response/Get/Operational/BGP/InstanceTable/Instance');