diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2015-05-13 16:23:26 +0200 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2015-05-13 16:29:31 +0200 |
| commit | 1f738ca5b8711ca5532a326cd646312e60484863 (patch) | |
| tree | 3fb8ee6561dd01c038937396ebb36ab09637b8ec | |
| parent | 07dffe9e5b08e97fb4f2421f14cf05eab383c116 (diff) | |
fix faad2 version check
On fedora 22, the output of cpp inserts extra debug comments, which
makes our regexp for the faad2 version check fail. This in turn causes
it to compile with the wrong arguments passed which then causes stack
corruption and crashes.
Fix this by only checking for the version (which should be by itself on
a single line). This is potentially less safe, it might be possible that
a similar string would appear in a later version in the header file.
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=748571
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f5ce28c22..d295253cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2008,9 +2008,9 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [ AC_MSG_CHECKING([Checking FAAD2 version in $faad_hdr]) for minor in 10 9 8 7 6 5 0; do if test x$faad2_minor_version = "x"; then - AC_EGREP_CPP([GST_CHECK_FAAD_VERSION \"2\.$minor\"], [ + AC_EGREP_CPP([\"2\.$minor\"$], [ #include <$faad_hdr> - GST_CHECK_FAAD_VERSION FAAD2_VERSION + FAAD2_VERSION ], [ faad2_minor_version=$minor ]) |