diff options
Diffstat (limited to 'meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch')
| -rw-r--r-- | meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch index 8b4ce400f3..bc2476bfc1 100644 --- a/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch +++ b/meta-oe/recipes-extended/t1lib/t1lib-5.1.2/format_security.patch @@ -1,3 +1,8 @@ +From cea83003de3ffebde92becd1e599fe3b28f0a7c4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 6 Mar 2017 23:13:36 -0800 +Subject: [PATCH] t1lib: Fix printf format string errors + Fix printf formats to use format qualifiers fixes @@ -6,20 +11,17 @@ error: format string is not a string literal (potentially insecure) [-Werror,-Wf Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending ---- a/lib/type1/objects.c -+++ b/lib/type1/objects.c -@@ -957,7 +957,7 @@ - - sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", - name, TypeFmt(expect), TypeFmt(obj->type)); -- IfTrace0(TRUE,typemsg); -+ IfTrace1(TRUE, "%s", typemsg); - - ObjectPostMortem(obj); - +--- + lib/t1lib/t1subset.c | 2 +- + lib/type1/objects.c | 2 +- + lib/type1/objects.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/t1lib/t1subset.c b/lib/t1lib/t1subset.c +index da427b2..e76974f 100644 --- a/lib/t1lib/t1subset.c +++ b/lib/t1lib/t1subset.c -@@ -759,7 +759,7 @@ +@@ -759,7 +759,7 @@ char *T1_SubsetFont( int FontID, tr_len); T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf, T1LOG_DEBUG); @@ -28,9 +30,24 @@ Upstream-Status: Pending } /* compute size of output file */ +diff --git a/lib/type1/objects.c b/lib/type1/objects.c +index c413a0f..f828e6a 100644 +--- a/lib/type1/objects.c ++++ b/lib/type1/objects.c +@@ -957,7 +957,7 @@ struct xobject *TypeErr(name, obj, expect, ret) /* non-ANSI avoids overly strict + + sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", + name, TypeFmt(expect), TypeFmt(obj->type)); +- IfTrace0(TRUE,typemsg); ++ IfTrace1(TRUE, "%s", typemsg); + + ObjectPostMortem(obj); + +diff --git a/lib/type1/objects.h b/lib/type1/objects.h +index 13cbae7..3a1d337 100644 --- a/lib/type1/objects.h +++ b/lib/type1/objects.h -@@ -214,7 +214,7 @@ +@@ -214,7 +214,7 @@ struct xobject { /*SHARED*/ /* NDW: personally, I want to see status and error messages! */ #define IfTrace0(condition,model) \ |