mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 22:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clear redundant "description" when merging two cylinder types

Browse source 
dive.c:
merge_cyclinder_type() can cause a small memory leak if two cylinder types
are about to be merged, but the redundant one has a "description" string
allocated.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2012-12-24 03:53:28 +02:00 • committed by Dirk Hohndel
parent 310b05ac84
commit fd03fcd66d
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dive.c
View file

@ -815,8 +815,13 @@ static void merge_events(struct divecomputer *res, struct divecomputer *src1, st
/* Pick whichever has any info (if either). Prefer 'a' */ /* Pick whichever has any info (if either). Prefer 'a' */
static void merge_cylinder_type(cylinder_type_t *res, cylinder_type_t *a, cylinder_type_t *b) static void merge_cylinder_type(cylinder_type_t *res, cylinder_type_t *a, cylinder_type_t *b)
{ {
if (a->size.mliter) cylinder_type_t *clean = a;
if (a->size.mliter) {
clean = b;
b = a; b = a;
}
if (clean->description)
free((void *)clean->description);
*res = *b; *res = *b;
} }