changeset 36644:8d39d6874ec0

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
author al
date Sun, 26 Jan 2014 04:14:23 +0000
parents 70c6735c36a3
children 289d315088ad
files gui/interface.c stream/stream_radio.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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);