diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-09-18 20:13:39 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-09-18 20:13:39 +0000 |
commit | b4bfafb3a4151028ea5f010ce8f81d43c16bc358 (patch) | |
tree | 006e72f986824bfc9e3092408f3fdc61e1eccb37 | |
parent | fc9c45188e769615b5aa686d159a8ae6bd90c081 (diff) | |
download | netpbm-mirror-b4bfafb3a4151028ea5f010ce8f81d43c16bc358.tar.gz netpbm-mirror-b4bfafb3a4151028ea5f010ce8f81d43c16bc358.tar.xz netpbm-mirror-b4bfafb3a4151028ea5f010ce8f81d43c16bc358.zip |
Fix free of non-allocated memory
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1285 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | converter/ppm/ppmtompeg/param.c | 10 | ||||
-rw-r--r-- | doc/HISTORY | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/converter/ppm/ppmtompeg/param.c b/converter/ppm/ppmtompeg/param.c index bb5bc79a..a145d33c 100644 --- a/converter/ppm/ppmtompeg/param.c +++ b/converter/ppm/ppmtompeg/param.c @@ -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 * const baseSourceP, 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. - */ } diff --git a/doc/HISTORY b/doc/HISTORY index 9617eaf9..fe858d19 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -15,6 +15,8 @@ not yet BJH Release 10.52.00 Mac OS X, because pnmtopng per se doesn't know about libz -- it's used by libpng. + ppmtompeg: fix crash with free of unallocated memory. + Build: don't fail due to SIGRTMIN, SIGRTMAX being undefined. Build: don't expect snprintf() to exist. |