mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

01_FHEMWEB.pm: Fix possible memeory leak (Forum #84372)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20089 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2019-09-01 15:17:06 +00:00
parent 9084f0dd89
commit 0a9fdf7f9d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/01_FHEMWEB.pm
View File

@@ -70,7 +70,7 @@ use vars qw($FW_sp); # stylesheetPrefix
# global variables, also used by 97_GROUP/95_VIEW/95_FLOORPLAN # global variables, also used by 97_GROUP/95_VIEW/95_FLOORPLAN
use vars qw(%FW_types); # device types, use vars qw(%FW_types); # device types,
use vars qw($FW_RET); # Returned data (html) use vars qw($FW_RET); # Returned data (html)
use vars qw($FW_RETTYPE); # image/png or the like use vars qw($FW_RETTYPE); # image/png or the like. Note: also as my below!
use vars qw($FW_wname); # Web instance use vars qw($FW_wname); # Web instance
use vars qw($FW_subdir); # Sub-path in URL, used by FLOORPLAN/weblink use vars qw($FW_subdir); # Sub-path in URL, used by FLOORPLAN/weblink
use vars qw(%FW_pos); # scroll position use vars qw(%FW_pos); # scroll position
@@ -106,7 +106,7 @@ my %FW_id2inform;
my $FW_data; # Filecontent from browser when editing a file my $FW_data; # Filecontent from browser when editing a file
my %FW_icons; # List of icons my %FW_icons; # List of icons
my @FW_iconDirs; # Directory search order for icons my @FW_iconDirs; # Directory search order for icons
my $FW_RETTYPE; # image/png or the like my $FW_RETTYPE; # image/png or the like: Note: also as use vars above!
my %FW_rooms; # hash of all rooms my %FW_rooms; # hash of all rooms
my %FW_extraRooms; # hash of extra rooms my %FW_extraRooms; # hash of extra rooms
my @FW_roomsArr; # ordered list of rooms my @FW_roomsArr; # ordered list of rooms
@@ -319,6 +319,7 @@ FW_Undef($$)
%FW_visibleDeviceHash = FW_visibleDevices(); %FW_visibleDeviceHash = FW_visibleDevices();
delete($logInform{$hash->{NAME}}); delete($logInform{$hash->{NAME}});
} }
delete $FW_svgData{$hash->{NAME}};
return $ret; return $ret;
} }
@@ -623,6 +624,7 @@ FW_finishRead($$$)
FW_closeConn($hash); FW_closeConn($hash);
TcpServer_Close($hash, 1); TcpServer_Close($hash, 1);
} }
$FW_RET="";
} }
sub sub
@@ -1996,6 +1998,7 @@ FW_showRoom()
my ($idx,$svgIdx) = (1,1); my ($idx,$svgIdx) = (1,1);
@atEnds = sort { $sortIndex{$a} cmp $sortIndex{$b} } @atEnds; @atEnds = sort { $sortIndex{$a} cmp $sortIndex{$b} } @atEnds;
$FW_svgData{$FW_cname} = { FW_RET=>$FW_RET, RES=>\%res, ATENDS=>\@atEnds }; $FW_svgData{$FW_cname} = { FW_RET=>$FW_RET, RES=>\%res, ATENDS=>\@atEnds };
my $svgDataUsed = 1;
foreach my $d (@atEnds) { foreach my $d (@atEnds) {
no strict "refs"; no strict "refs";
my $fn = $modules{$defs{$d}{TYPE}}{FW_summaryFn}; my $fn = $modules{$defs{$d}{TYPE}}{FW_summaryFn};
@@ -2007,11 +2010,13 @@ FW_showRoom()
return "$FW_cname,$d,". return "$FW_cname,$d,".
encode_base64(&{$fn}($FW_wname,$d,$FW_room,\%extPage),''); encode_base64(&{$fn}($FW_wname,$d,$FW_room,\%extPage),'');
}, undef, "FW_svgCollect"); }, undef, "FW_svgCollect");
$svgDataUsed++;
} else { } else {
$res{$d} = &{$fn}($FW_wname,$d,$FW_room,\%extPage); $res{$d} = &{$fn}($FW_wname,$d,$FW_room,\%extPage);
} }
use strict "refs"; use strict "refs";
} }
delete($FW_svgData{$FW_cname}) if(!$svgDataUsed);
return FW_svgDone(\%res, \@atEnds, undef); return FW_svgDone(\%res, \@atEnds, undef);
} }