diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-23 19:58:00 -1000 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2012-11-25 13:04:47 -0800 |
| commit | 8d62f20aa0fccfe4ae6f0de6f5ccd1bcb0920075 (patch) | |
| tree | 372eaf004e22d25f01e54d2d684a5d7fd8cc96ce /parse-xml.c | |
| parent | 27f7e58493ca16266f32363f55fbe3d979348af0 (diff) | |
| download | subsurface-8d62f20aa0fccfe4ae6f0de6f5ccd1bcb0920075.tar.gz | |
Fix "prefer downloaded" dive sample merging case
When we have a preferred dive computer that overrides old information
when merging two dives, we just copy the dive computer data over.
However, we need to clear the source of the dive computer data so that
we then don't free the sample data when that old source of the newly
merged dive gets free'd.
This fixes a memory scribble (and likely SIGSEGV) for the "prefer
downloaded" case.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'parse-xml.c')
0 files changed, 0 insertions, 0 deletions