tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-09-23 Dario Rodriguez <dario.rodriguez@artica.es> 

* lib/PandoraFMS/NmapParser.pm: Added an error handler to avoid 
	error during NmapParser lib execution.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4990 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2011-09-23 11:18:26 +00:00
parent 8005a2021f
commit 0df7c34986
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2011-09-23 Dario Rodriguez <dario.rodriguez@artica.es>
* lib/PandoraFMS/NmapParser.pm: Added an error handler to avoid
error during NmapParser lib execution.
2011-09-22 Junichi Satoh <junichi@rworks.jp> 2011-09-22 Junichi Satoh <junichi@rworks.jp>
* pandora_server_installer: Fixed invalid group settings. * pandora_server_installer: Fixed invalid group settings.

9
pandora_server/lib/PandoraFMS/NmapParser.pm
View File

@ -101,8 +101,15 @@ sub callback {
sub parse { sub parse {
my $self = shift; my $self = shift;
$self->_init(); $self->_init();
eval {
$self->{twig}->safe_parse(@_); $self->{twig}->safe_parse(@_);
if ($@) { die $@; } };
if ($@) {
return;
}
$self->_clean(); $self->_clean();
$self->purge; $self->purge;
return $self; return $self;