CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdparanoia: Fix build with security flags

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2017-06-26 22:57:08 -07:00 committed by Martin Jansa
parent 6fb9a9e7a2
commit d193035a51
3 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb
View File

@ -13,7 +13,9 @@ SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${PV}.sr
file://0003-Fix-missing-shared-object-LDFLAGS.patch \
file://dont-use-internal-configs.patch \
file://out-of-tree-build.patch \
"
file://0001-check-for-null-buffer-before-trying-a-byteswap.patch \
file://0002-Fix-printf-format-errors.patch \
"
SRC_URI[md5sum] = "b304bbe8ab63373924a744eac9ebc652"
SRC_URI[sha256sum] = "005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df"

31
meta-multimedia/recipes-multimedia/cdparanoia/files/0001-check-for-null-buffer-before-trying-a-byteswap.patch Normal file
View File

@ -0,0 +1,31 @@
From c760c5d31f2412a5be5ac6896e6069d1cea08527 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 26 Jun 2017 22:31:45 -0700
Subject: [PATCH 1/2] check for null buffer before trying a byteswap
Author: Monty <paranoia@xiph.org>
Patch from debian
http://sources.debian.net/src/cdparanoia/3.10.2%2Bdebian-11/debian/patches/04-endian.patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
interface/interface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/interface/interface.c b/interface/interface.c
index 526c2a9..763a0ea 100644
--- a/interface/interface.c
+++ b/interface/interface.c
@@ -118,7 +118,7 @@ long cdda_read_timed(cdrom_drive *d, void *buffer, long beginsector, long sector
if(d->bigendianp==-1) /* not determined yet */
d->bigendianp=data_bigendianp(d);
- if(d->bigendianp!=bigendianp()){
+ if(buffer && d->bigendianp!=bigendianp()){
int i;
u_int16_t *p=(u_int16_t *)buffer;
long els=sectors*CD_FRAMESIZE_RAW/2;
--
2.13.2

32
meta-multimedia/recipes-multimedia/cdparanoia/files/0002-Fix-printf-format-errors.patch Normal file
View File

@ -0,0 +1,32 @@
From f4f81bdadb9515938b3b5d13707bd4b9322fd967 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 26 Jun 2017 22:37:13 -0700
Subject: [PATCH 2/2] Fix printf format errors
error: format not a string literal and no format arguments
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main.c b/main.c
index 664acac..d568fb1 100644
--- a/main.c
+++ b/main.c
@@ -588,10 +588,10 @@ static void callback(long inpos, int function){
buffer[aheadposition+19]='>';
}
- fprintf(stderr,buffer);
+ fprintf(stderr, "%s", buffer);
if (logfile != NULL && function==-1) {
- fprintf(logfile,buffer+1);
+ fprintf(logfile, "%s", buffer+1);
fprintf(logfile,"\n\n");
fflush(logfile);
}
--
2.13.2