michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-08-05 07:20:43 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Non-empty hashes written to files should never be empty

Browse Source
This commit is contained in:
Jamie Cameron
2021-12-24 13:02:39 -08:00
parent 4c865c5fc8
commit 473776455d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web-lib-funcs.pl
View File

@@ -179,7 +179,7 @@ else {
}
}
}
&close_tempfile(ARFILE);
&close_tempfile(ARFILE, %{$data_hash} ? 1 : 0);
if (defined($main::read_file_cache{$realfile})) {
%{$main::read_file_cache{$realfile}} = %{$data_hash};
}
@@ -9589,7 +9589,7 @@ else {
}
}
=head2 close_tempfile(file|handle)
=head2 close_tempfile(file|handle, [fail-if-empty])
Copies a temp file to the actual file, assuming that all writes were
successful. The handle must have been one passed to open_tempfile.
@@ -9599,6 +9599,7 @@ sub close_tempfile
{
my $file;
my $fh = &callers_package($_[0]);
my $notempty = $_[1];
if (defined($file = $main::open_temphandles{$fh})) {
# Closing a handle
@@ -9622,6 +9623,10 @@ elsif (defined($main::open_tempfiles{$_[0]})) {
" >/dev/null 2>&1");
}
my @old_attributes = &get_clear_file_attributes($_[0]);
if ($notempty && -z $main::open_tempfiles{$_[0]}) {
if ($noerror) { return 0; }
else { &error("Temporary file @{[html_escape($main::open_tempfiles{$_[0]})]} is empty!"); }
}
if (!rename($main::open_tempfiles{$_[0]}, $_[0])) {
if ($noerror) { return 0; }
else { &error("Failed to replace @{[html_escape($_[0])]} with @{[html_escape($main::open_tempfiles{$_[0]})]} : $!"); }