From 21c068f1916330e90f814bed461fe0821d1665ec Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Sun, 9 Oct 2011 16:36:37 +0000 Subject: checked in pd-0.43-0.src.tar.gz svn path=/trunk/; revision=15557 --- pd/src/x_gui.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'pd/src/x_gui.c') diff --git a/pd/src/x_gui.c b/pd/src/x_gui.c index e83981bb..2409ca41 100644 --- a/pd/src/x_gui.c +++ b/pd/src/x_gui.c @@ -46,6 +46,9 @@ void gfxstub_new(t_pd *owner, void *key, const char *cmd) { char buf[4*MAXPDSTRING]; char namebuf[80]; + char sprintfbuf[MAXPDSTRING]; + char *afterpercent; + t_int afterpercentlen; t_gfxstub *x; t_symbol *s; /* if any exists with matching key, burn it. */ @@ -55,7 +58,7 @@ void gfxstub_new(t_pd *owner, void *key, const char *cmd) if (strlen(cmd) + 50 > 4*MAXPDSTRING) { bug("audio dialog too long"); - bug("%x", cmd); + bug("%s", cmd); return; } x = (t_gfxstub *)pd_new(gfxstub_class); @@ -68,7 +71,13 @@ void gfxstub_new(t_pd *owner, void *key, const char *cmd) x->x_key = key; x->x_next = gfxstub_list; gfxstub_list = x; - sprintf(buf, cmd, s->s_name); + /* only replace first %s so sprintf() doesn't crash */ + afterpercent = strchr(cmd, '%') + 2; + afterpercentlen = afterpercent - cmd; + strncpy(sprintfbuf, cmd, afterpercentlen); + sprintfbuf[afterpercentlen] = '\0'; + sprintf(buf, sprintfbuf, s->s_name); + strncat(buf, afterpercent, (4*MAXPDSTRING) - afterpercentlen); sys_gui(buf); } -- cgit v1.2.1