Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-alsa-utils: Commit

external/alsa-utils


Commit MetaInfo

Revisiónc9dc401264ad3c0b621f52e8098e7c1661c50cea (tree)
Tiempo2019-11-21 06:01:26
AutorRosen Penev <rosenp@gmai...>
CommiterTakashi Iwai

Log Message

aplay: Limit VUMeter progress bar to 100 for negative as well

While the progress bar cannot be negative, GCC concludes that it can be
and assumes tmp can be written past the end. Fixes this GCC warning:

aplay.c:1747:18: warning: '%02d' directive writing between 2 and 11 bytes

into a region of size 4 [-Wformat-overflow=]
1747 | sprintf(tmp, "%02d%%", maxperc[c]);

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Cambiar Resumen

Diferencia

--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -54,6 +54,8 @@
5454 #include "formats.h"
5555 #include "version.h"
5656
57+#define ABS(a) (a) < 0 ? -(a) : (a)
58+
5759 #ifdef SND_CHMAP_API_VERSION
5860 #define CONFIG_SUPPORT_CHMAP 1
5961 #endif
@@ -1741,7 +1743,7 @@ static void print_vu_meter_stereo(int *perc, int *maxperc)
17411743 line[bar_length + 6 + 1 + p] = '+';
17421744 else
17431745 line[bar_length - p - 1] = '+';
1744- if (maxperc[c] > 99)
1746+ if (ABS(maxperc[c]) > 99)
17451747 sprintf(tmp, "MAX");
17461748 else
17471749 sprintf(tmp, "%02d%%", maxperc[c]);
Show on old repository browser