# HG changeset patch # User al # Date 1390709663 0 # Node ID 8d39d6874ec0de2cb08a66a08a6421c181ad91c0 # Parent 70c6735c36a37cde8aa5cbb02b711958d86b539c Do not use non-literal arguments for mp_msg format string Make the code easier to review and more robust against future changes. Fix ticket #2173 diff -r 70c6735c36a3 -r 8d39d6874ec0 gui/interface.c --- a/gui/interface.c Sat Jan 25 16:55:12 2014 +0000 +++ b/gui/interface.c Sun Jan 26 04:14:23 2014 +0000 @@ -1183,7 +1183,7 @@ vsnprintf(msg, sizeof(msg), format, va); va_end(va); - mp_msg(mod, lev, msg); + mp_msg(mod, lev, "%s", msg); if (mp_msg_test(mod, lev)) gtkMessageBox(MSGBOX_FATAL, msg); diff -r 70c6735c36a3 -r 8d39d6874ec0 stream/stream_radio.c --- a/stream/stream_radio.c Sat Jan 25 16:55:12 2014 +0000 +++ b/stream/stream_radio.c Sun Jan 26 04:14:23 2014 +0000 @@ -1138,7 +1138,7 @@ mp_msg(MSGT_RADIO,MSGL_V,"\n"); if(priv->driver) - mp_msg(MSGT_RADIO, MSGL_INFO, priv->driver->info); + mp_msg(MSGT_RADIO, MSGL_INFO, "%s", priv->driver->info); else{ mp_msg(MSGT_RADIO, MSGL_INFO, MSGTR_RADIO_DriverUnknownStr,priv->radio_param->driver); close_s(stream);