On Thu, Dec 01, 2011 at 12:30:22AM +0100, Loïc Minier wrote:
> Attached debdiff fixes format strings and the build here.
You beat me to it :-)
> --- t1lib-5.1.2.orig/debian/patches/format-security.diff
> +++ t1lib-5.1.2/debian/patches/format-security.diff
> @@ -0,0 +1,22 @@
> +--- 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);
> +
IMO a better fix for this part would be to fix the IfTrace0 macro
directly. That way we don't have to play whack-a-mole with any other
users that may be added later.
I'd suggest:
=== modified file 'lib/type1/objects.h'
--- lib/type1/objects.h 2011-12-01 12:05:37 +0000
+++ lib/type1/objects.h 2011-12-01 12:05:51 +0000
@@ -214,7 +214,7 @@ struct xobject {
/*SHARED*/
/* NDW: personally, I want to see status and error messages! */
#define IfTrace0(condition,model) \
- {if (condition) printf(model);}
+ {if (condition) fputs(model,stdout);}
#define IfTrace1(condition,model,arg0) \
{if (condition) printf(model,arg0);}
#define IfTrace2(condition,model,arg0,arg1) \
(The rest of your patch is still needed, of course.)
--
Colin Watson [cjwat...@ubuntu.com]
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
