external libs: rebuilt flac with undefined behavior fixes from mainstream
authorOzkan Sezer <sezeroz@gmail.com>
Sun, 01 Dec 2019 21:50:02 +0300
changeset 1053a7d2efcbc36c
parent 1052 5500d13631b4
child 1054 ae77864d2fa7
external libs: rebuilt flac with undefined behavior fixes from mainstream
VisualC/external/lib/x64/libFLAC-8.dll
VisualC/external/lib/x86/libFLAC-8.dll
Xcode/Frameworks/FLAC.framework/Versions/A/FLAC
external/flac-1.3.3/0002a-flac.git-19a0e99.patch
external/flac-1.3.3/0004a-flac.git-7bc7aeb.patch
external/flac-1.3.3/0005a-flac.git-6455e47.patch
external/flac-1.3.3/0012-flac.git-d4a1b345.patch
external/flac-1.3.3/0013-flac.git-b917d456.patch
external/flac-1.3.3/0013a-flac.git-25305d6.patch
external/flac-1.3.3/0015c-flac.git-b02e159.patch
external/flac-1.3.3/src/libFLAC/bitreader.c
external/flac-1.3.3/src/utils/flacdiff/main.cpp
     1.1 Binary file VisualC/external/lib/x64/libFLAC-8.dll has changed
     2.1 Binary file VisualC/external/lib/x86/libFLAC-8.dll has changed
     3.1 Binary file Xcode/Frameworks/FLAC.framework/Versions/A/FLAC has changed
     4.1 --- a/external/flac-1.3.3/0002a-flac.git-19a0e99.patch	Sun Dec 01 20:20:02 2019 +0300
     4.2 +++ b/external/flac-1.3.3/0002a-flac.git-19a0e99.patch	Sun Dec 01 21:50:02 2019 +0300
     4.3 @@ -1,15 +1,13 @@
     4.4 -From 19a0e99ac3ac5f1fc24d66612668a277ceba8195 Mon Sep 17 00:00:00 2001
     4.5  From: sezero <sezero@users.sourceforge.net>
     4.6 -Date: Wed, 9 Oct 2019 10:39:11 +0300
     4.7 -Subject: [PATCH] move the new public get_decoder_client_data function to public header.
     4.8 +Date: Wed, 9 Oct 2019 07:39:11 +0000 (+0300)
     4.9 +Subject: move the new public get_decoder_client_data function to public header.
    4.10 +X-Git-Url: http://git.xiph.org/?p=flac.git;a=commitdiff_plain;h=19a0e99ac3ac5f1fc24d66612668a277ceba8195
    4.11  
    4.12 +move the new public get_decoder_client_data function to public header.
    4.13  ---
    4.14 - include/FLAC/stream_decoder.h                  |   10 ++++++++++
    4.15 - src/libFLAC/include/protected/stream_decoder.h |    5 -----
    4.16 - 2 files changed, 10 insertions(+), 5 deletions(-)
    4.17  
    4.18  diff --git a/include/FLAC/stream_decoder.h b/include/FLAC/stream_decoder.h
    4.19 -index 57215c5..50ebfa8 100644
    4.20 +index 57215c5e..50ebfa80 100644
    4.21  --- a/include/FLAC/stream_decoder.h
    4.22  +++ b/include/FLAC/stream_decoder.h
    4.23  @@ -1550,6 +1550,16 @@ FLAC_API FLAC__bool FLAC__stream_decoder_skip_single_frame(FLAC__StreamDecoder *
    4.24 @@ -30,7 +28,7 @@
    4.25   
    4.26   #ifdef __cplusplus
    4.27  diff --git a/src/libFLAC/include/protected/stream_decoder.h b/src/libFLAC/include/protected/stream_decoder.h
    4.28 -index 9909275..2f3996b 100644
    4.29 +index 99092751..2f3996b3 100644
    4.30  --- a/src/libFLAC/include/protected/stream_decoder.h
    4.31  +++ b/src/libFLAC/include/protected/stream_decoder.h
    4.32  @@ -57,9 +57,4 @@ typedef struct FLAC__StreamDecoderProtected {
    4.33 @@ -43,6 +41,3 @@
    4.34  -FLAC_API const void *FLAC__get_decoder_client_data(FLAC__StreamDecoder *decoder);
    4.35  -
    4.36   #endif
    4.37 --- 
    4.38 -1.7.1
    4.39 -
     5.1 --- a/external/flac-1.3.3/0004a-flac.git-7bc7aeb.patch	Sun Dec 01 20:20:02 2019 +0300
     5.2 +++ b/external/flac-1.3.3/0004a-flac.git-7bc7aeb.patch	Sun Dec 01 21:50:02 2019 +0300
     5.3 @@ -1,18 +1,13 @@
     5.4 -From 7bc7aebc7c7f10e3e5252162b668095845cd509a Mon Sep 17 00:00:00 2001
     5.5  From: NY00123 <ny00@outlook.com>
     5.6 -Date: Mon, 14 Oct 2019 22:15:18 +0300
     5.7 -Subject: [PATCH] Replace unsigned with uint32_t in prototypes; Fixes DJGPP builds.
     5.8 +Date: Mon, 14 Oct 2019 19:15:18 +0000 (+0300)
     5.9 +Subject: Replace unsigned with uint32_t in prototypes; Fixes DJGPP builds.
    5.10 +X-Git-Url: http://git.xiph.org/?p=flac.git;a=commitdiff_plain;h=7bc7aebc7c7f10e3e5252162b668095845cd509a
    5.11  
    5.12 +Replace unsigned with uint32_t in prototypes; Fixes DJGPP builds.
    5.13  ---
    5.14 - include/test_libs_common/file_utils_flac.h |    2 +-
    5.15 - include/test_libs_common/metadata_utils.h  |    6 +++---
    5.16 - src/flac/analyze.h                         |    2 +-
    5.17 - src/flac/encode.h                          |    2 +-
    5.18 - src/flac/utils.h                           |    2 +-
    5.19 - 5 files changed, 7 insertions(+), 7 deletions(-)
    5.20  
    5.21  diff --git a/include/test_libs_common/file_utils_flac.h b/include/test_libs_common/file_utils_flac.h
    5.22 -index 8b809b8..7687c8f 100644
    5.23 +index 8b809b85..7687c8f7 100644
    5.24  --- a/include/test_libs_common/file_utils_flac.h
    5.25  +++ b/include/test_libs_common/file_utils_flac.h
    5.26  @@ -31,6 +31,6 @@
    5.27 @@ -24,7 +19,7 @@
    5.28   
    5.29   #endif
    5.30  diff --git a/include/test_libs_common/metadata_utils.h b/include/test_libs_common/metadata_utils.h
    5.31 -index ad0f6f5..6bd4e8f 100644
    5.32 +index ad0f6f58..6bd4e8f6 100644
    5.33  --- a/include/test_libs_common/metadata_utils.h
    5.34  +++ b/include/test_libs_common/metadata_utils.h
    5.35  @@ -28,9 +28,9 @@
    5.36 @@ -49,7 +44,7 @@
    5.37   FLAC__bool mutils__compare_block(const FLAC__StreamMetadata *block, const FLAC__StreamMetadata *blockcopy);
    5.38   
    5.39  diff --git a/src/flac/analyze.h b/src/flac/analyze.h
    5.40 -index 7c7ec23..44798c7 100644
    5.41 +index 7c7ec237..44798c71 100644
    5.42  --- a/src/flac/analyze.h
    5.43  +++ b/src/flac/analyze.h
    5.44  @@ -26,7 +26,7 @@ typedef struct {
    5.45 @@ -62,7 +57,7 @@
    5.46   
    5.47   #endif
    5.48  diff --git a/src/flac/encode.h b/src/flac/encode.h
    5.49 -index 51c68a4..b98bef6 100644
    5.50 +index 51c68a40..b98bef6b 100644
    5.51  --- a/src/flac/encode.h
    5.52  +++ b/src/flac/encode.h
    5.53  @@ -112,6 +112,6 @@ typedef struct {
    5.54 @@ -74,7 +69,7 @@
    5.55   
    5.56   #endif
    5.57  diff --git a/src/flac/utils.h b/src/flac/utils.h
    5.58 -index 6932d3e..36ceb37 100644
    5.59 +index 6932d3ef..36ceb37d 100644
    5.60  --- a/src/flac/utils.h
    5.61  +++ b/src/flac/utils.h
    5.62  @@ -62,7 +62,7 @@ void stats_print_name(int level, const char *name);
    5.63 @@ -86,6 +81,3 @@
    5.64   
    5.65   FLAC__bool flac__utils_parse_cue_specification(const char *s, utils__CueSpecification *spec);
    5.66   void flac__utils_canonicalize_cue_specification(const utils__CueSpecification *cue_spec, const FLAC__StreamMetadata_CueSheet *cuesheet, FLAC__uint64 total_samples, utils__SkipUntilSpecification *skip_spec, utils__SkipUntilSpecification *until_spec);
    5.67 --- 
    5.68 -1.7.1
    5.69 -
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/external/flac-1.3.3/0005a-flac.git-6455e47.patch	Sun Dec 01 21:50:02 2019 +0300
     6.3 @@ -0,0 +1,21 @@
     6.4 +From: Andrey Astafyev <dev@246060.ru>
     6.5 +Date: Fri, 29 Nov 2019 17:03:25 +0000 (+0300)
     6.6 +Subject: Both files are checked for EOF
     6.7 +X-Git-Url: http://git.xiph.org/?p=flac.git;a=commitdiff_plain;h=6455e477218360899c55f8dbd06c6628260d4123
     6.8 +
     6.9 +Both files are checked for EOF
    6.10 +---
    6.11 +
    6.12 +diff --git a/src/utils/flacdiff/main.cpp b/src/utils/flacdiff/main.cpp
    6.13 +index f86b8bbd..6a42db15 100644
    6.14 +--- a/src/utils/flacdiff/main.cpp
    6.15 ++++ b/src/utils/flacdiff/main.cpp
    6.16 +@@ -166,7 +166,7 @@ static FLAC__off_t get_diff_offset(AutoFILE &f1, AutoFILE &f2)
    6.17 + {
    6.18 + 	FLAC__off_t off = 0;
    6.19 + 	while(1) {
    6.20 +-		if(feof((FILE*)f1) && feof((FILE*)f1)) {
    6.21 ++		if(feof((FILE*)f1) && feof((FILE*)f2)) {
    6.22 + 			fprintf(stderr, "ERROR: files are identical\n");
    6.23 + 			return -1;
    6.24 + 		}
     7.1 --- a/external/flac-1.3.3/0012-flac.git-d4a1b345.patch	Sun Dec 01 20:20:02 2019 +0300
     7.2 +++ b/external/flac-1.3.3/0012-flac.git-d4a1b345.patch	Sun Dec 01 21:50:02 2019 +0300
     7.3 @@ -1,7 +1,9 @@
     7.4 -From d4a1b345dd16591ff6f17c67ee519afebe2f9792 Mon Sep 17 00:00:00 2001
     7.5  From: sezero <sezero@users.sourceforge.net>
     7.6 -Date: Tue, 8 Oct 2019 20:25:55 +0300
     7.7 -Subject: [PATCH] configure.ac: allow several compiler flags for clang
     7.8 +Date: Tue, 8 Oct 2019 17:25:55 +0000 (+0300)
     7.9 +Subject: configure.ac: allow several compiler flags for clang
    7.10 +X-Git-Url: http://git.xiph.org/?p=flac.git;a=commitdiff_plain;h=d4a1b345dd16591ff6f17c67ee519afebe2f9792
    7.11 +
    7.12 +configure.ac: allow several compiler flags for clang
    7.13  
    7.14  The flac configury marked clang as 'not being gcc' and excluded
    7.15  a lot of compiler switches, most importantly the visibility flags,
    7.16 @@ -26,12 +28,9 @@
    7.17  and gcc-4.4.7 and clang-3.4.2 on an i686-linux.  Also tested cross-
    7.18  compiling for Mac OS X using clang-5.0.2.
    7.19  ---
    7.20 - configure.ac      |   18 ++++++++++++++----
    7.21 - m4/gcc_version.m4 |    3 +++
    7.22 - 2 files changed, 17 insertions(+), 4 deletions(-)
    7.23  
    7.24  diff --git a/configure.ac b/configure.ac
    7.25 -index 6efefaf..88f89a9 100644
    7.26 +index 6efefaf5..88f89a91 100644
    7.27  --- a/configure.ac
    7.28  +++ b/configure.ac
    7.29  @@ -429,11 +429,12 @@ dnl If debugging is disabled AND no CFLAGS/CXXFLAGS/CPPFLAGS/LDFLAGS
    7.30 @@ -75,7 +74,7 @@
    7.31   		CFLAGS="$CFLAGS -fvisibility=hidden"
    7.32   		CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
    7.33  diff --git a/m4/gcc_version.m4 b/m4/gcc_version.m4
    7.34 -index 1c53086..e6aaa60 100644
    7.35 +index 1c53086f..e6aaa603 100644
    7.36  --- a/m4/gcc_version.m4
    7.37  +++ b/m4/gcc_version.m4
    7.38  @@ -22,6 +22,9 @@ if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then
    7.39 @@ -88,6 +87,3 @@
    7.40   	fi
    7.41   
    7.42   AC_SUBST(GCC_VERSION)
    7.43 --- 
    7.44 -1.7.1
    7.45 -
     8.1 --- a/external/flac-1.3.3/0013-flac.git-b917d456.patch	Sun Dec 01 20:20:02 2019 +0300
     8.2 +++ b/external/flac-1.3.3/0013-flac.git-b917d456.patch	Sun Dec 01 21:50:02 2019 +0300
     8.3 @@ -1,7 +1,9 @@
     8.4 -From b917d456d23c3268cc6f466d720605b713d7b9ff Mon Sep 17 00:00:00 2001
     8.5  From: sezero <sezero@users.sourceforge.net>
     8.6 -Date: Tue, 8 Oct 2019 15:10:20 +0300
     8.7 -Subject: [PATCH] make dllexport work with compilers other than MSVC
     8.8 +Date: Tue, 8 Oct 2019 12:10:20 +0000 (+0300)
     8.9 +Subject: make dllexport work with compilers other than MSVC
    8.10 +X-Git-Url: http://git.xiph.org/?p=flac.git;a=commitdiff_plain;h=b917d456d23c3268cc6f466d720605b713d7b9ff
    8.11 +
    8.12 +make dllexport work with compilers other than MSVC
    8.13  
    8.14  the issue is, flac and metaflac exes rely on flac_internal_???_utf8()
    8.15  procedures from windows_unicode_filenames.c and there is no easy way
    8.16 @@ -9,14 +11,9 @@
    8.17  explicitly (they are exported anyway w/o this patch), but add a FIXME
    8.18  note about the kludge in windows_unicode_filenames.c.
    8.19  ---
    8.20 - configure.ac                            |   16 ++++++++++++++++
    8.21 - include/FLAC++/export.h                 |    2 +-
    8.22 - include/FLAC/export.h                   |    2 +-
    8.23 - src/libFLAC/windows_unicode_filenames.c |   19 +++++++++++--------
    8.24 - 4 files changed, 29 insertions(+), 10 deletions(-)
    8.25  
    8.26  diff --git a/configure.ac b/configure.ac
    8.27 -index 14e2205..6efefaf 100644
    8.28 +index 14e2205a..6efefaf5 100644
    8.29  --- a/configure.ac
    8.30  +++ b/configure.ac
    8.31  @@ -493,6 +493,22 @@ if test x$enable_stack_smash_protection = "xyes" ; then
    8.32 @@ -43,7 +40,7 @@
    8.33   	Makefile \
    8.34   	src/Makefile \
    8.35  diff --git a/include/FLAC++/export.h b/include/FLAC++/export.h
    8.36 -index 1645362..6776b29 100644
    8.37 +index 16453621..6776b29c 100644
    8.38  --- a/include/FLAC++/export.h
    8.39  +++ b/include/FLAC++/export.h
    8.40  @@ -59,7 +59,7 @@
    8.41 @@ -56,7 +53,7 @@
    8.42   #define	FLACPP_API __declspec(dllexport)
    8.43   #else
    8.44  diff --git a/include/FLAC/export.h b/include/FLAC/export.h
    8.45 -index d52f0bb..628fe5f 100644
    8.46 +index d52f0bbb..628fe5fc 100644
    8.47  --- a/include/FLAC/export.h
    8.48  +++ b/include/FLAC/export.h
    8.49  @@ -59,7 +59,7 @@
    8.50 @@ -69,7 +66,7 @@
    8.51   #define	FLAC_API __declspec(dllexport)
    8.52   #else
    8.53  diff --git a/src/libFLAC/windows_unicode_filenames.c b/src/libFLAC/windows_unicode_filenames.c
    8.54 -index 7855008..7f59ebe 100644
    8.55 +index 78550087..7f59ebea 100644
    8.56  --- a/src/libFLAC/windows_unicode_filenames.c
    8.57  +++ b/src/libFLAC/windows_unicode_filenames.c
    8.58  @@ -37,6 +37,9 @@
    8.59 @@ -150,6 +147,3 @@
    8.60   {
    8.61   	if (!utf8_filenames) {
    8.62   		return rename(oldname, newname);
    8.63 --- 
    8.64 -1.7.1
    8.65 -
     9.1 --- a/external/flac-1.3.3/0013a-flac.git-25305d6.patch	Sun Dec 01 20:20:02 2019 +0300
     9.2 +++ b/external/flac-1.3.3/0013a-flac.git-25305d6.patch	Sun Dec 01 21:50:02 2019 +0300
     9.3 @@ -1,16 +1,15 @@
     9.4 -From 25305d685b52979295064a9b566e697372a9878a Mon Sep 17 00:00:00 2001
     9.5  From: sezero <sezero@users.sourceforge.net>
     9.6 -Date: Fri, 18 Oct 2019 08:11:10 +0300
     9.7 -Subject: [PATCH] Fix msvc build after commit b917d456
     9.8 +Date: Fri, 18 Oct 2019 05:11:10 +0000 (+0300)
     9.9 +Subject: Fix msvc build after commit b917d456
    9.10 +X-Git-Url: http://git.xiph.org/?p=flac.git;a=commitdiff_plain;h=25305d685b52979295064a9b566e697372a9878a
    9.11 +
    9.12 +Fix msvc build after commit b917d456
    9.13  
    9.14  Closes: https://github.com/xiph/flac/issues/152
    9.15  ---
    9.16 - include/share/windows_unicode_filenames.h |   19 +++++++++++--------
    9.17 - src/libFLAC/windows_unicode_filenames.c   |    1 -
    9.18 - 2 files changed, 11 insertions(+), 9 deletions(-)
    9.19  
    9.20  diff --git a/include/share/windows_unicode_filenames.h b/include/share/windows_unicode_filenames.h
    9.21 -index 526b30d..94cbeb6 100644
    9.22 +index 526b30d5..94cbeb6c 100644
    9.23  --- a/include/share/windows_unicode_filenames.h
    9.24  +++ b/include/share/windows_unicode_filenames.h
    9.25  @@ -39,21 +39,24 @@
    9.26 @@ -47,7 +46,7 @@
    9.27   #ifdef __cplusplus
    9.28   } /* extern "C" */
    9.29  diff --git a/src/libFLAC/windows_unicode_filenames.c b/src/libFLAC/windows_unicode_filenames.c
    9.30 -index 7f59ebe..bf3bfe1 100644
    9.31 +index 7f59ebea..bf3bfe16 100644
    9.32  --- a/src/libFLAC/windows_unicode_filenames.c
    9.33  +++ b/src/libFLAC/windows_unicode_filenames.c
    9.34  @@ -38,7 +38,6 @@
    9.35 @@ -58,6 +57,3 @@
    9.36   
    9.37   /* convert UTF-8 back to WCHAR. Caller is responsible for freeing memory */
    9.38   static wchar_t *wchar_from_utf8(const char *str)
    9.39 --- 
    9.40 -1.7.1
    9.41 -
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/external/flac-1.3.3/0015c-flac.git-b02e159.patch	Sun Dec 01 21:50:02 2019 +0300
    10.3 @@ -0,0 +1,35 @@
    10.4 +From: Erik de Castro Lopo <erikd@mega-nerd.com>
    10.5 +Date: Sun, 24 Nov 2019 03:14:50 +0000 (+1100)
    10.6 +Subject: libFLAC/bitreader.c: Fix shift invoking undefined behaviour
    10.7 +X-Git-Url: http://git.xiph.org/?p=flac.git;a=commitdiff_plain;h=b02e1593525f63aaa4c671e034ff8f0cdc641e46
    10.8 +
    10.9 +libFLAC/bitreader.c: Fix shift invoking undefined behaviour
   10.10 +
   10.11 +Credit: Oss-Fuzz
   10.12 +Issue: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19067
   10.13 +Testcase: fuzzer_decoder-5725157960450048
   10.14 +---
   10.15 +
   10.16 +diff --git a/src/libFLAC/bitreader.c b/src/libFLAC/bitreader.c
   10.17 +index e94f8b01..79cb5cc4 100644
   10.18 +--- a/src/libFLAC/bitreader.c
   10.19 ++++ b/src/libFLAC/bitreader.c
   10.20 +@@ -405,7 +405,8 @@ FLAC__bool FLAC__bitreader_read_raw_uint32(FLAC__BitReader *br, FLAC__uint32 *va
   10.21 + 			const brword word = br->buffer[br->consumed_words];
   10.22 + 			const brword mask = br->consumed_bits < FLAC__BITS_PER_WORD ? FLAC__WORD_ALL_ONES >> br->consumed_bits : 0;
   10.23 + 			if(bits < n) {
   10.24 +-				*val = (FLAC__uint32)((word & mask) >> (n-bits)); /* The result has <= 32 non-zero bits */
   10.25 ++				uint32_t shift = n - bits;
   10.26 ++				*val = shift < FLAC__BITS_PER_WORD ? (FLAC__uint32)((word & mask) >> shift) : 0; /* The result has <= 32 non-zero bits */
   10.27 + 				br->consumed_bits += bits;
   10.28 + 				return true;
   10.29 + 			}
   10.30 +@@ -670,7 +671,7 @@ FLAC__bool FLAC__bitreader_read_unary_unsigned(FLAC__BitReader *br, uint32_t *va
   10.31 + 	*val = 0;
   10.32 + 	while(1) {
   10.33 + 		while(br->consumed_words < br->words) { /* if we've not consumed up to a partial tail word... */
   10.34 +-			brword b = br->buffer[br->consumed_words] << br->consumed_bits;
   10.35 ++			brword b = br->consumed_bits < FLAC__BITS_PER_WORD ? br->buffer[br->consumed_words] << br->consumed_bits : 0;
   10.36 + 			if(b) {
   10.37 + 				i = COUNT_ZERO_MSBS(b);
   10.38 + 				*val += i;
    11.1 --- a/external/flac-1.3.3/src/libFLAC/bitreader.c	Sun Dec 01 20:20:02 2019 +0300
    11.2 +++ b/external/flac-1.3.3/src/libFLAC/bitreader.c	Sun Dec 01 21:50:02 2019 +0300
    11.3 @@ -405,7 +405,8 @@
    11.4  			const brword word = br->buffer[br->consumed_words];
    11.5  			const brword mask = br->consumed_bits < FLAC__BITS_PER_WORD ? FLAC__WORD_ALL_ONES >> br->consumed_bits : 0;
    11.6  			if(bits < n) {
    11.7 -				*val = (FLAC__uint32)((word & mask) >> (n-bits)); /* The result has <= 32 non-zero bits */
    11.8 +				uint32_t shift = n - bits;
    11.9 +				*val = shift < FLAC__BITS_PER_WORD ? (FLAC__uint32)((word & mask) >> shift) : 0; /* The result has <= 32 non-zero bits */
   11.10  				br->consumed_bits += bits;
   11.11  				return true;
   11.12  			}
   11.13 @@ -670,7 +671,7 @@
   11.14  	*val = 0;
   11.15  	while(1) {
   11.16  		while(br->consumed_words < br->words) { /* if we've not consumed up to a partial tail word... */
   11.17 -			brword b = br->buffer[br->consumed_words] << br->consumed_bits;
   11.18 +			brword b = br->consumed_bits < FLAC__BITS_PER_WORD ? br->buffer[br->consumed_words] << br->consumed_bits : 0;
   11.19  			if(b) {
   11.20  				i = COUNT_ZERO_MSBS(b);
   11.21  				*val += i;
    12.1 --- a/external/flac-1.3.3/src/utils/flacdiff/main.cpp	Sun Dec 01 20:20:02 2019 +0300
    12.2 +++ b/external/flac-1.3.3/src/utils/flacdiff/main.cpp	Sun Dec 01 21:50:02 2019 +0300
    12.3 @@ -166,7 +166,7 @@
    12.4  {
    12.5  	FLAC__off_t off = 0;
    12.6  	while(1) {
    12.7 -		if(feof((FILE*)f1) && feof((FILE*)f1)) {
    12.8 +		if(feof((FILE*)f1) && feof((FILE*)f2)) {
    12.9  			fprintf(stderr, "ERROR: files are identical\n");
   12.10  			return -1;
   12.11  		}