Merge pull request #440 from jslachta/asterisk-13-removal-1907
[feed/telephony.git] / net / freeswitch-stable / patches / 410-mod_say_ja-fix-format-overflow.patch
1 commit 3ca75eb8efa4e50ebe083a269b75fcb1762daa91
2 Author: Sebastian Kemper <sebastian_ml@gmx.net>
3 Date: Sun Apr 14 19:23:41 2019 +0200
4
5 FS-11783: [mod_say_ja] quiet overflow warning
6
7 With -Wformat-overflow gcc warns about calls to formatted input/output
8 function "sprintf" that might overflow the destination buffer.
9
10 In this case gcc does not know the upper bound of tm_min and assumes
11 that up to 11 bytes might be written to buffer (3 bytes). But we know
12 that tm_min can only be within the range 0 to 59.
13
14 mod_say_ja.c: In function 'ja_say_time':
15 mod_say_ja.c:376:35: error: '%d' directive writing between 2 and 10 bytes into a region of size 3 [-Werror=format-overflow=]
16 sprintf(buffer, "%d", tm.tm_min);
17 ^~
18 mod_say_ja.c:376:34: note: directive argument in the range [11, 2147483647]
19 sprintf(buffer, "%d", tm.tm_min);
20 ^~~~
21 mod_say_ja.c:376:18: note: 'sprintf' output between 3 and 11 bytes into a destination of size 3
22 sprintf(buffer, "%d", tm.tm_min);
23 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
24
25 This commits adds a hint for gcc, which silences the warning.
26
27 Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
28
29 diff --git a/src/mod/say/mod_say_ja/mod_say_ja.c b/src/mod/say/mod_say_ja/mod_say_ja.c
30 index 72c7c38131..d8e0692fd0 100644
31 --- a/src/mod/say/mod_say_ja/mod_say_ja.c
32 +++ b/src/mod/say/mod_say_ja/mod_say_ja.c
33 @@ -367,7 +367,8 @@ static switch_status_t ja_say_time(switch_core_session_t *session, char *tosay,
34 say_file("time/pm.wav");
35 }
36 say_file("time/hour-%d.wav", tm.tm_hour);
37 - if (tm.tm_min > 10) {
38 + /* tm_min is always < 60 - this is just to silence gcc 8 warning */
39 + if (tm.tm_min > 10 && tm.tm_min < 60) {
40 int temp;
41 char tch[1+1];
42 mod_min = tm.tm_min % 10;