diff options
author | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
commit | ed068b960eeedb92823238783779730319b8ba0e (patch) | |
tree | 36a4de280458d52520b911b2716eb5cea309fd78 /gnu/packages/patches/libwmf-CVE-2006-3376.patch | |
parent | a9308efec642bfbce480545a22fce848e6212456 (diff) | |
parent | ffc015bea26f24d862e7e877d907fbe1ab9a9967 (diff) | |
download | guix-ed068b960eeedb92823238783779730319b8ba0e.tar guix-ed068b960eeedb92823238783779730319b8ba0e.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/libwmf-CVE-2006-3376.patch')
-rw-r--r-- | gnu/packages/patches/libwmf-CVE-2006-3376.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/gnu/packages/patches/libwmf-CVE-2006-3376.patch b/gnu/packages/patches/libwmf-CVE-2006-3376.patch deleted file mode 100644 index 1e0e1ecfa8..0000000000 --- a/gnu/packages/patches/libwmf-CVE-2006-3376.patch +++ /dev/null @@ -1,30 +0,0 @@ -Copied from Debian. - ---- libwmf-0.2.8.4.orig/src/player.c -+++ libwmf-0.2.8.4/src/player.c -@@ -23,6 +23,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <stdint.h> - #include <string.h> - #include <math.h> - -@@ -132,8 +133,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) > 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 * sizeof (unsigned char)); - - if (ERR (API)) - { WMF_DEBUG (API,"bailing..."); - |