diff --git a/SOURCES/babl-0.1.10-memory.patch b/SOURCES/babl-0.1.10-memory.patch new file mode 100644 index 0000000..7e9435f --- /dev/null +++ b/SOURCES/babl-0.1.10-memory.patch @@ -0,0 +1,25 @@ +diff -urNp old/babl/babl-memory.c new/babl/babl-memory.c +--- old/babl/babl-memory.c 2017-10-06 09:07:51.085178917 +0200 ++++ new/babl/babl-memory.c 2017-10-06 09:14:08.186524320 +0200 +@@ -84,14 +84,19 @@ functions_sanity (void) + if (first_malloc_used != malloc_f || + first_free_used != free_f) + { ++ static int displayed = 0; ++ + if (first_malloc_used == NULL) + { + first_malloc_used = malloc_f; + first_free_used = free_f; + } +- else ++ else if (!displayed) + { +- babl_fatal ("babl memory function(s) attempted switched on the fly"); ++ fprintf (stderr, "HMM....\nSomething strange is happening,\n%s function pointer changing between invocations in babl.\n", ++ first_malloc_used == malloc_f ? "free" : ++ (first_free_used == free_f ? "malloc" : "malloc and free")); ++ displayed = 1; + } + } + } diff --git a/SPECS/babl.spec b/SPECS/babl.spec index 5bee82f..9d89e0b 100644 --- a/SPECS/babl.spec +++ b/SPECS/babl.spec @@ -6,7 +6,7 @@ Summary: A dynamic, any to any, pixel format conversion library Name: babl Version: 0.1.10 -Release: 9%{?dist} +Release: 10%{?dist} # Compute some version related macros # Ugly hack, you need to get your quoting backslashes/percent signs straight @@ -20,6 +20,7 @@ License: LGPLv3+ and GPLv3+ Group: System Environment/Libraries URL: http://www.gegl.org/babl/ Source0: ftp://ftp.gimp.org/pub/babl/%{apiver}/%{name}-%{version}.tar.bz2 +Patch1: babl-0.1.10-memory.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: librsvg2 @@ -58,6 +59,7 @@ This package contains documentation needed for developing with %{name}. %prep %setup -q +%patch1 -p1 -b .memory %build # use PIC/PIE because babl is likely to deal with data coming from untrusted @@ -118,6 +120,9 @@ rm -rf %{buildroot} %doc %{develdocdir} %changelog +* Fri Oct 06 2017 Josef Ridky - 0.1.10-10 +- Resolves: #1399878 - fix recursive loop + * Fri Jan 24 2014 Daniel Mach - 0.1.10-9 - Mass rebuild 2014-01-24