From eacf6f9637e17ba1868d31a89bdf7f5e68fee01e Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Sun, 17 Jan 2016 16:03:10 -0600
Subject: [PATCH] [libpng17] Changed PNG_USE_MKSTEMP to __COVERITY__ to select
 alternate

"tmpfile()" implementation in contrib/libtests/pngstest.c
---
 ANNOUNCE                    | 6 ++++--
 CHANGES                     | 4 +++-
 contrib/libtests/pngstest.c | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 43e856c27..d6f500d3c 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.7.0beta78 - January 16, 2016
+Libpng 1.7.0beta78 - January 17, 2016
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -1214,7 +1214,9 @@ Version 1.7.0beta77 [January 16, 2016]
     than 1:1000.
   Worked around a false-positive Coverity issue in pngvalid.c.
 
-Version 1.7.0beta78 [January 16, 2016]
+Version 1.7.0beta78 [January 17, 2016]
+  Changed PNG_USE_MKSTEMP to __COVERITY__ to select alternate
+    "tmpfile()" implementation in contrib/libtests/pngstest.c
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index bcc8f8fed..7fabbd2b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5513,7 +5513,9 @@ Version 1.7.0beta77 [January 16, 2016]
     than 1:1000.
   Worked around a false-positive Coverity issue in pngvalid.c.
 
-Version 1.7.0beta78 [January 16, 2016]
+Version 1.7.0beta78 [January 17, 2016]
+  Changed PNG_USE_MKSTEMP to __COVERITY__ to select alternate
+    "tmpfile()" implementation in contrib/libtests/pngstest.c
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/libtests/pngstest.c b/contrib/libtests/pngstest.c
index 0febb63a1..8f27ac81d 100644
--- a/contrib/libtests/pngstest.c
+++ b/contrib/libtests/pngstest.c
@@ -1,9 +1,9 @@
 /*-
  * pngstest.c
  *
- * Copyright (c) 2013-2015 John Cunningham Bowler
+ * Copyright (c) 2013-2016 John Cunningham Bowler
  *
- * Last changed in libpng 1.6.19 [November 12, 2015]
+ * Last changed in libpng 1.6.22 [(PENDING RELEASE)]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
@@ -3096,7 +3096,7 @@ write_one_file(Image *output, Image *image, int convert_to_8bit)
 
    if (image->opts & USE_STDIO)
    {
-#ifndef PNG_USE_MKSTEMP
+#ifndef __COVERITY__
       FILE *f = tmpfile();
 #else
       /* Experimental. Coverity says tmpfile() is insecure because it