diff options
2 files changed, 27 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch new file mode 100644 index 0000000000..111e98ac1f --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0004-Fix-format-error-blocking-compilation-with-hardening.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | From: Petter Reinholdtsen <pere@hungry.com> | ||
| 2 | Date: Wed, 22 Oct 2014 13:25:21 +0200 | ||
| 3 | Subject: Fix format error blocking compilation with hardening | ||
| 4 | |||
| 5 | Last-Update: 2014-10-22 | ||
| 6 | Forwarded: no | ||
| 7 | |||
| 8 | Enabling hardening refuses to compile code with sprintf() calls | ||
| 9 | with no formatting string. Adjust the code to work with hardening. | ||
| 10 | --- | ||
| 11 | ogg123/status.c | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/ogg123/status.c b/ogg123/status.c | ||
| 15 | index 92b8ff1..ccec389 100644 | ||
| 16 | --- a/ogg123/status.c | ||
| 17 | +++ b/ogg123/status.c | ||
| 18 | @@ -148,7 +148,7 @@ int print_statistics_line (stat_format_t stats[]) | ||
| 19 | |||
| 20 | switch (stats->type) { | ||
| 21 | case stat_noarg: | ||
| 22 | - len += sprintf(str+len, stats->formatstr); | ||
| 23 | + len += sprintf(str+len, "%s", stats->formatstr); | ||
| 24 | break; | ||
| 25 | case stat_intarg: | ||
| 26 | len += sprintf(str+len, stats->formatstr, stats->arg.intarg); | ||
diff --git a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb index 2683555f19..e43cb40329 100644 --- a/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb +++ b/meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb | |||
| @@ -12,6 +12,7 @@ DEPENDS = "libogg libvorbis curl libao" | |||
| 12 | 12 | ||
| 13 | SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \ | 13 | SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \ |
| 14 | file://0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch \ | 14 | file://0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch \ |
| 15 | file://0004-Fix-format-error-blocking-compilation-with-hardening.patch \ | ||
| 15 | " | 16 | " |
| 16 | 17 | ||
| 17 | SRC_URI[md5sum] = "567e0fb8d321b2cd7124f8208b8b90e6" | 18 | SRC_URI[md5sum] = "567e0fb8d321b2cd7124f8208b8b90e6" |
