diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-09-19 22:03:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-09-19 22:03:26 +0000 |
| commit | 8f28f1b4b8c9dcef6de9d2ffb08e3fe5115f40e0 (patch) | |
| tree | bb082e0fd84fa1cecbb749ffd77d008f6974cf09 /media-libs/netpbm | |
| parent | Version bump, bug #338053. (diff) | |
| download | gentoo-2-8f28f1b4b8c9dcef6de9d2ffb08e3fe5115f40e0.tar.gz gentoo-2-8f28f1b4b8c9dcef6de9d2ffb08e3fe5115f40e0.tar.bz2 gentoo-2-8f28f1b4b8c9dcef6de9d2ffb08e3fe5115f40e0.zip | |
use patch from upstream -- no functional changes
Diffstat (limited to 'media-libs/netpbm')
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch b/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch index ee5be69c14c5..0c1e48549b1b 100644 --- a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch +++ b/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch @@ -1,15 +1,35 @@ -addedSourceP is a pointer to a struct declared on the stack, so we cant -call free() on it +fix from upstream -e-mailed to upstream maintainer already +------------------------------------------------------------------------ +r1285 | giraffedata | 2010-09-18 16:13:39 -0400 (Sat, 18 Sep 2010) | 1 line ---- converter/ppm/ppmtompeg/param.c -+++ converter/ppm/ppmtompeg/param.c -@@ -295,7 +295,6 @@ mergeInputSource(struct inputSource * co +Fix free of non-allocated memory + +Index: converter/ppm/ppmtompeg/param.c +=================================================================== +--- converter/ppm/ppmtompeg/param.c (revision 1284) ++++ converter/ppm/ppmtompeg/param.c (revision 1285) +@@ -283,8 +283,8 @@ GetFrameRate(const char * const p) + + + static void +-mergeInputSource(struct inputSource * const baseSourceP, +- struct inputSource * const addedSourceP) { ++mergeInputSource(struct inputSource * const baseSourceP, ++ const struct inputSource * const addedSourceP) { + + unsigned int i; + +@@ -294,12 +294,6 @@ mergeInputSource(struct inputSource * co + for (i = 0; i < addedSourceP->numInputFileEntries; ++i) baseSourceP->inputFileEntries[baseSourceP->numInputFileEntries++] = addedSourceP->inputFileEntries[i]; - +- - free(addedSourceP); - /* Note the space allocated for the *addedSourceP input file - entries themselves is still allocated, and used by - *baseSourceP. +- /* Note the space allocated for the *addedSourceP input file +- entries themselves is still allocated, and used by +- *baseSourceP. +- */ + } + + |