diff options
author | Ross Burton <ross.burton@intel.com> | 2016-07-14 10:21:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:28:48 +0100 |
commit | 220a68bfc2cfd4f243706d97e3944f02b2bc01ff (patch) | |
tree | 46d0a09accb4e49046bcdb35b7b3628d2281ce16 /meta/recipes-extended/bash/bash-3.2.48 | |
parent | 2184694a17b20346a5a2c7b84f419c5161e8a24c (diff) | |
download | poky-220a68bfc2cfd4f243706d97e3944f02b2bc01ff.tar.gz |
bash: fix string format errors when enabling security flags
If security_flags.inc is included then bash 3.2.48 fails to build:
| ../bash-3.2.48/print_cmd.c:1152:3: error: format not a string literal and no format arguments [-Werror=format-security]
| cprintf (indentation_string);
Backport a patch from upstream to solve this.
(From OE-Core rev: 293d90d757d0d1e292c90cb0e9c576faf911ffcc)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/bash/bash-3.2.48')
-rw-r--r-- | meta/recipes-extended/bash/bash-3.2.48/string-format.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-extended/bash/bash-3.2.48/string-format.patch b/meta/recipes-extended/bash/bash-3.2.48/string-format.patch new file mode 100644 index 0000000000..eda39649d9 --- /dev/null +++ b/meta/recipes-extended/bash/bash-3.2.48/string-format.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Fix a string format warning when using security flags: | ||
2 | |||
3 | | ../bash-3.2.48/print_cmd.c:1152:3: error: format not a string literal and no format arguments [-Werror=format-security] | ||
4 | | cprintf (indentation_string); | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
8 | |||
9 | diff --git a/print_cmd.c b/print_cmd.c | ||
10 | index d1dfd1a..956db53 100644 | ||
11 | --- a/print_cmd.c | ||
12 | +++ b/print_cmd.c | ||
13 | @@ -1149,7 +1149,7 @@ indent (amount) | ||
14 | for (i = 0; amount > 0; amount--) | ||
15 | indentation_string[i++] = ' '; | ||
16 | indentation_string[i] = '\0'; | ||
17 | - cprintf (indentation_string); | ||
18 | + cprintf ("%s", indentation_string); | ||
19 | } | ||
20 | |||
21 | static void | ||