diff --git a/libwmf-0.2.8.4-intoverflow.patch b/libwmf-0.2.8.4-intoverflow.patch index c50b88f..507fe66 100644 --- a/libwmf-0.2.8.4-intoverflow.patch +++ b/libwmf-0.2.8.4-intoverflow.patch @@ -14,14 +14,14 @@ -/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char)); - */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); -+ if (MAX_REC_SIZE(API) > SIZE_MAX / 2) ++ if (MAX_REC_SIZE(API) > UINT32_MAX / 2) + { + API->err = wmf_E_InsMem; + WMF_DEBUG (API,"bailing..."); + return (API->err); + } + -+ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2); ++ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char)); if (ERR (API)) { WMF_DEBUG (API,"bailing..."); diff --git a/libwmf.spec b/libwmf.spec index 2eafcd8..64917eb 100644 --- a/libwmf.spec +++ b/libwmf.spec @@ -1,7 +1,7 @@ Summary: Windows Metafile Library Name: libwmf Version: 0.2.8.4 -Release: 9.1 +Release: 10 Group: System Environment/Libraries License: LGPL Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz @@ -107,6 +107,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.la rm -r $RPM_BUILD_ROOT %changelog +* Fri Jul 14 2006 Caolan McNamara 0.2.8.4-10 +- retweak for 64bit + * Wed Jul 12 2006 Jesse Keating - 0.2.8.4-9.1 - rebuild