Added patch to avoid leaking output name in sfnt2fon if specified multiple times.

This commit is contained in:
Sebastian Lackner 2015-11-22 23:21:30 +01:00
parent 3d3f7c7088
commit 55a86c83c0
3 changed files with 47 additions and 0 deletions

View File

@ -6,6 +6,8 @@ wine-staging (1.8~rc1) UNRELEASED; urgency=low
wineserver call (accepted upstream).
* Added patch to improve detection of symbol charset for old truetype fonts.
* Added patch to change value for WM_MDICALCCHILDSCROLL to 0x003f.
* Added patch to avoid leaking output name in sfnt2fon if specified multiple
times.
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 15 Nov 2015 21:20:51 +0100
wine-staging (1.7.55) unstable; urgency=low

View File

@ -0,0 +1,29 @@
From 6f561502fe458837f3a5b27f477b1a52f33d88ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
Date: Mon, 16 Nov 2015 22:36:40 +0100
Subject: sfnt2fon: Don't leak output name if specified multiple times
(Coverity)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: André Hentschel <nerv@dawncrow.de>
---
tools/sfnt2fon/sfnt2fon.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c
index 7612bc2..f825ae4 100644
--- a/tools/sfnt2fon/sfnt2fon.c
+++ b/tools/sfnt2fon/sfnt2fon.c
@@ -654,6 +654,7 @@ static char **parse_options( int argc, char **argv )
option_defchar = atoi( optarg );
break;
case 'o':
+ free( option_output );
option_output = strdup( optarg );
break;
case 'q':
--
2.6.2

View File

@ -83,6 +83,7 @@ warning()
patch_enable_all ()
{
enable_Compiler_Warnings="$1"
enable_Coverity="$1"
enable_Exagear="$1"
enable_Pipelight="$1"
enable_Staging="$1"
@ -355,6 +356,9 @@ patch_enable ()
Compiler_Warnings)
enable_Compiler_Warnings="$2"
;;
Coverity)
enable_Coverity="$2"
;;
Exagear)
enable_Exagear="$2"
;;
@ -2100,6 +2104,18 @@ if test "$enable_Compiler_Warnings" -eq 1; then
) >> "$patchlist"
fi
# Patchset Coverity
# |
# | Modified files:
# | * tools/sfnt2fon/sfnt2fon.c
# |
if test "$enable_Coverity" -eq 1; then
patch_apply Coverity/0001-sfnt2fon-Don-t-leak-output-name-if-specified-multipl.patch
(
echo '+ { "André Hentschel", "sfnt2fon: Don'\''t leak output name if specified multiple times (Coverity).", 1 },';
) >> "$patchlist"
fi
# Patchset ws2_32-WriteWatches
# |
# | Modified files: