Bug 1124432: Backport upstream bug 1079065 to bmo/4.2 to fix improper use of open() calls

2 files changed, 4 insertions, 4 deletions

diff --git a/extensions/Push/lib/Connector/TCL.pm b/extensions/Push/lib/Connector/TCL.pm
index 16ebb0319..25e5750dc 100644
--- a/extensions/Push/lib/Connector/TCL.pm
+++ b/extensions/Push/lib/Connector/TCL.pm
@@ -267,7 +267,7 @@ sub _get_bug_data {
 
 sub _write_file {
     my ($filename, $content) = @_;
-    open(my $fh, ">$filename") or die "Failed to write to $filename: $!\n";
+    open(my $fh, ">", $filename) or die "Failed to write to $filename: $!\n";
     binmode($fh);
     print $fh $content;
     close($fh) or die "Failed to write to $filename: $!\n";
diff --git a/extensions/Push/lib/Daemon.pm b/extensions/Push/lib/Daemon.pm
index 66e15783e..c8472e450 100644
--- a/extensions/Push/lib/Daemon.pm
+++ b/extensions/Push/lib/Daemon.pm
@@ -69,12 +69,12 @@ sub gd_redirect_output {
     my $self = shift;
 
     my $filename = bz_locations()->{datadir} . '/' . $self->{gd_progname} . ".log";
-    open(STDERR, ">>$filename") or (print "could not open stderr: $!" && exit(1));
+    open(STDERR, ">>", $filename) or (print "could not open stderr: $!" && exit(1));
     close(STDOUT);
-    open(STDOUT, ">&STDERR") or die "redirect STDOUT -> STDERR: $!";
+    open(STDOUT, ">&", STDERR) or die "redirect STDOUT -> STDERR: $!";
     $SIG{HUP} = sub {
         close(STDERR);
-        open(STDERR, ">>$filename") or (print "could not open stderr: $!" && exit(1));
+        open(STDERR, ">>", $filename) or (print "could not open stderr: $!" && exit(1));
     };
 }