blob: 0c1e48549b1b4df64d794056e1509906675609dd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
fix from upstream
------------------------------------------------------------------------
r1285 | giraffedata | 2010-09-18 16:13:39 -0400 (Sat, 18 Sep 2010) | 1 line
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.
- */
}
|
