summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-27 10:22:30 +0000
committerMichael Stahl <mstahl@redhat.com>2015-01-27 13:23:37 +0000
commit59a49499241030ecdf68c2d4c13ce26fe1f4b380 (patch)
tree8f186c0840fc835fc38fb2dea4a490ecb46e40c2
parent3c2dd3d5b94c6bfa2dc1c87b3f45562f60b41136 (diff)
Resolves: tdf#88819 printing with ps hangs
regression from commit bbf3aa7f92c194c9cc4546c95706e6b28e0c070c Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Nov 14 11:06:44 2014 +0000 coverity#705989 silence Insecure temporary file and coverity#705983 Insecure temporary file Change-Id: If580196322e68098adc38a9fdb775827843a9c30 Reviewed-on: https://gerrit.libreoffice.org/14202 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--extensions/source/scanner/sane.cxx2
-rw-r--r--vcl/generic/print/glyphset.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 84475d572b5c..26cb83ada3ec 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -697,7 +697,7 @@ bool Sane::Start( BitmapTransporter& rBitmap )
}
utl::TempFile aFrame;
aFrame.EnableKillingFile();
- FILE* pFrame = fopen(OUStringToOString(aFrame.GetFileName(), osl_getThreadTextEncoding()).getStr(), "wb");
+ FILE* pFrame = fopen(OUStringToOString(aFrame.GetFileName(), osl_getThreadTextEncoding()).getStr(), "w+b");
if( ! pFrame )
{
bSuccess = false;
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index 30946a374ae3..405e0e8c399b 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -744,7 +744,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
utl::TempFile aTmpFile;
aTmpFile.EnableKillingFile();
- FILE* pTmpFile = fopen(OUStringToOString(aTmpFile.GetFileName(), osl_getThreadTextEncoding()).getStr(), "wb");
+ FILE* pTmpFile = fopen(OUStringToOString(aTmpFile.GetFileName(), osl_getThreadTextEncoding()).getStr(), "w+b");
if (pTmpFile == NULL)
return false;