added my Recipes
This commit is contained in:
@@ -0,0 +1,77 @@
|
||||
From 99127676dba8f5d607757428bc14a6b7ab52d5ed Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 16 Dec 2016 12:42:06 +0100
|
||||
Subject: [PATCH 1/3] fix negative shift constants
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Stolen from [1]
|
||||
|
||||
[1] http://pkgs.fedoraproject.org/cgit/rpms/audiofile.git/tree/audiofile-0.3.6-left-shift-neg.patch
|
||||
|
||||
Upstrem-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
libaudiofile/modules/SimpleModule.h | 2 +-
|
||||
test/FloatToInt.cpp | 2 +-
|
||||
test/IntToFloat.cpp | 2 +-
|
||||
test/Sign.cpp | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h
|
||||
index 03c6c69..e4cc138 100644
|
||||
--- a/libaudiofile/modules/SimpleModule.h
|
||||
+++ b/libaudiofile/modules/SimpleModule.h
|
||||
@@ -123,7 +123,7 @@ struct signConverter
|
||||
typedef typename IntTypes<Format>::UnsignedType UnsignedType;
|
||||
|
||||
static const int kScaleBits = (Format + 1) * CHAR_BIT - 1;
|
||||
- static const int kMinSignedValue = -1 << kScaleBits;
|
||||
+ static const int kMinSignedValue = 0-(1U<<kScaleBits);
|
||||
|
||||
struct signedToUnsigned : public std::unary_function<SignedType, UnsignedType>
|
||||
{
|
||||
diff --git a/test/FloatToInt.cpp b/test/FloatToInt.cpp
|
||||
index 0d179a8..bf491b2 100644
|
||||
--- a/test/FloatToInt.cpp
|
||||
+++ b/test/FloatToInt.cpp
|
||||
@@ -115,7 +115,7 @@ TEST_F(FloatToIntTest, Int16)
|
||||
EXPECT_EQ(readData[i], expectedData[i]);
|
||||
}
|
||||
|
||||
-static const int32_t kMinInt24 = -1<<23;
|
||||
+static const int32_t kMinInt24 = 0-(1U<<23);
|
||||
static const int32_t kMaxInt24 = (1<<23) - 1;
|
||||
|
||||
TEST_F(FloatToIntTest, Int24)
|
||||
diff --git a/test/IntToFloat.cpp b/test/IntToFloat.cpp
|
||||
index b716635..1d91b58 100644
|
||||
--- a/test/IntToFloat.cpp
|
||||
+++ b/test/IntToFloat.cpp
|
||||
@@ -117,7 +117,7 @@ TEST_F(IntToFloatTest, Int16)
|
||||
EXPECT_EQ(readData[i], expectedData[i]);
|
||||
}
|
||||
|
||||
-static const int32_t kMinInt24 = -1<<23;
|
||||
+static const int32_t kMinInt24 = 0-(1U<<23);
|
||||
static const int32_t kMaxInt24 = (1<<23) - 1;
|
||||
|
||||
TEST_F(IntToFloatTest, Int24)
|
||||
diff --git a/test/Sign.cpp b/test/Sign.cpp
|
||||
index 7275399..c339514 100644
|
||||
--- a/test/Sign.cpp
|
||||
+++ b/test/Sign.cpp
|
||||
@@ -116,7 +116,7 @@ TEST_F(SignConversionTest, Int16)
|
||||
EXPECT_EQ(readData[i], expectedData[i]);
|
||||
}
|
||||
|
||||
-static const int32_t kMinInt24 = -1<<23;
|
||||
+static const int32_t kMinInt24 = 0-(1U<<23);
|
||||
static const int32_t kMaxInt24 = (1<<23) - 1;
|
||||
static const uint32_t kMaxUInt24 = (1<<24) - 1;
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
From a74c1e9c583375b9e55c29a36442485089e4b7f9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 16 Dec 2016 12:42:06 +0100
|
||||
Subject: [PATCH 2/3] fix build on gcc6
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Stolen from [1]
|
||||
|
||||
[1] http://pkgs.fedoraproject.org/cgit/rpms/audiofile.git/tree/audiofile-0.3.6-narrowing.patch
|
||||
|
||||
Upstrem-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
test/NeXT.cpp | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/test/NeXT.cpp b/test/NeXT.cpp
|
||||
index 7e39850..a37cea1 100644
|
||||
--- a/test/NeXT.cpp
|
||||
+++ b/test/NeXT.cpp
|
||||
@@ -37,13 +37,13 @@
|
||||
|
||||
#include "TestUtilities.h"
|
||||
|
||||
-const char kDataUnspecifiedLength[] =
|
||||
+const signed char kDataUnspecifiedLength[] =
|
||||
{
|
||||
'.', 's', 'n', 'd',
|
||||
0, 0, 0, 24, // offset of 24 bytes
|
||||
- 0xff, 0xff, 0xff, 0xff, // unspecified length
|
||||
+ -1, -1, -1, -1, // unspecified length
|
||||
0, 0, 0, 3, // 16-bit linear
|
||||
- 0, 0, 172, 68, // 44100 Hz
|
||||
+ 0, 0, -84, 68, // 44100 Hz (0xAC44)
|
||||
0, 0, 0, 1, // 1 channel
|
||||
0, 1,
|
||||
0, 1,
|
||||
@@ -57,13 +57,13 @@ const char kDataUnspecifiedLength[] =
|
||||
0, 55
|
||||
};
|
||||
|
||||
-const char kDataTruncated[] =
|
||||
+const signed char kDataTruncated[] =
|
||||
{
|
||||
'.', 's', 'n', 'd',
|
||||
0, 0, 0, 24, // offset of 24 bytes
|
||||
0, 0, 0, 20, // length of 20 bytes
|
||||
0, 0, 0, 3, // 16-bit linear
|
||||
- 0, 0, 172, 68, // 44100 Hz
|
||||
+ 0, 0, -84, 68, // 44100 Hz (0xAC44)
|
||||
0, 0, 0, 1, // 1 channel
|
||||
0, 1,
|
||||
0, 1,
|
||||
@@ -152,13 +152,13 @@ TEST(NeXT, Truncated)
|
||||
ASSERT_EQ(::unlink(testFileName.c_str()), 0);
|
||||
}
|
||||
|
||||
-const char kDataZeroChannels[] =
|
||||
+const signed char kDataZeroChannels[] =
|
||||
{
|
||||
'.', 's', 'n', 'd',
|
||||
0, 0, 0, 24, // offset of 24 bytes
|
||||
0, 0, 0, 2, // 2 bytes
|
||||
0, 0, 0, 3, // 16-bit linear
|
||||
- 0, 0, 172, 68, // 44100 Hz
|
||||
+ 0, 0, -84, 68, // 44100 Hz (0xAC44)
|
||||
0, 0, 0, 0, // 0 channels
|
||||
0, 1
|
||||
};
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 746c38105ce4fa1b609995d3386ea6b8b1f2f7bd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Fri, 16 Dec 2016 12:50:51 +0100
|
||||
Subject: [PATCH 3/3] fix CVE-2015-7747
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Stolen from [1]
|
||||
|
||||
[1] http://pkgs.fedoraproject.org/cgit/rpms/audiofile.git/tree/audiofile-0.3.6-CVE-2015-7747.patch
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
libaudiofile/modules/ModuleState.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libaudiofile/modules/ModuleState.cpp b/libaudiofile/modules/ModuleState.cpp
|
||||
index f76c495..0c29d7a 100644
|
||||
--- a/libaudiofile/modules/ModuleState.cpp
|
||||
+++ b/libaudiofile/modules/ModuleState.cpp
|
||||
@@ -402,7 +402,7 @@ status ModuleState::arrange(AFfilehandle file, Track *track)
|
||||
addModule(new Transform(outfc, in.pcm, out.pcm));
|
||||
|
||||
if (in.channelCount != out.channelCount)
|
||||
- addModule(new ApplyChannelMatrix(infc, isReading,
|
||||
+ addModule(new ApplyChannelMatrix(outfc, isReading,
|
||||
in.channelCount, out.channelCount,
|
||||
in.pcm.minClip, in.pcm.maxClip,
|
||||
track->channelMatrix));
|
||||
--
|
||||
2.7.4
|
||||
|
||||
Reference in New Issue
Block a user