summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-11-14 11:06:44 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-11-14 12:02:49 +0000
commitbbf3aa7f92c194c9cc4546c95706e6b28e0c070c (patch)
tree93467eccdc8f3b2f1acb867c18d988665ca9aa99
parent64cc39e0c576611297625ebcac8d48613a5bb175 (diff)
coverity#705989 silence Insecure temporary file
and coverity#705983 Insecure temporary file Change-Id: I2a501f8114ddf8968381e1880263abaf9d1bdc6f
-rw-r--r--extensions/Library_scn.mk1
-rw-r--r--extensions/source/scanner/sane.cxx5
-rw-r--r--vcl/generic/print/glyphset.cxx10
3 files changed, 11 insertions, 5 deletions
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index dc9fbba49b6a..73716d1e9ab5 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_libraries,scn,\
svt \
vcl \
tl \
+ utl \
comphelper \
cppuhelper \
cppu \
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index fbf7c3c20da2..84475d572b5c 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -21,6 +21,7 @@
#include <math.h>
#include <osl/file.h>
#include <tools/stream.hxx>
+#include <unotools/tempfile.hxx>
#include <sane.hxx>
#include <dlfcn.h>
#include <stdio.h>
@@ -694,7 +695,9 @@ bool Sane::Start( BitmapTransporter& rBitmap )
if( nStatus != SANE_STATUS_GOOD )
bSynchronousRead = true;
}
- FILE* pFrame = tmpfile();
+ utl::TempFile aFrame;
+ aFrame.EnableKillingFile();
+ FILE* pFrame = fopen(OUStringToOString(aFrame.GetFileName(), osl_getThreadTextEncoding()).getStr(), "wb");
if( ! pFrame )
{
bSuccess = false;
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index 285ee4b478c6..30946a374ae3 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -35,6 +35,8 @@
#include "rtl/ustring.hxx"
#include "rtl/strbuf.hxx"
+#include <unotools/tempfile.hxx>
+
#include <set>
#include <map>
#include <algorithm>
@@ -59,9 +61,6 @@ GlyphSet::~GlyphSet ()
/* FIXME delete the glyphlist ??? */
}
-
-
-
bool
GlyphSet::GetCharID (
sal_Unicode nChar,
@@ -742,7 +741,10 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
sal_Int32 nSuccess = OpenTTFontFile(aTTFileName.getStr(), nFace, &pTTFont);
if (nSuccess != SF_OK)
return false;
- FILE* pTmpFile = tmpfile();
+
+ utl::TempFile aTmpFile;
+ aTmpFile.EnableKillingFile();
+ FILE* pTmpFile = fopen(OUStringToOString(aTmpFile.GetFileName(), osl_getThreadTextEncoding()).getStr(), "wb");
if (pTmpFile == NULL)
return false;