diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-22 08:32:51 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-22 10:38:11 -0700 |
| commit | 92ecbc8c83d8039cb1b16e3ab6adbb3acbef581c (patch) | |
| tree | 1ae19202f30257fcc9f300bd7fba551353d354cb /core/parse-xml.c | |
| parent | b9f52d0aff470991568a7c1af5af529b0142e1e8 (diff) | |
| download | subsurface-92ecbc8c83d8039cb1b16e3ab6adbb3acbef581c.tar.gz | |
parse-xml: use the right dc for filling in extra data
"cur_dc" may be NULL when the XML source isn't a subsurface XML file,
and xml parsing is supposed to use "get_dc()" to pick a dive computer
when the nesting of the XML may not be proper.
Now, XML sources that don't have the proper dive computer nesting
markers generally also do not end up having the extra-data string
information, but one example of this is the simple XML that the
libdivecomputer 'dctool' program generates.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/parse-xml.c')
| -rw-r--r-- | core/parse-xml.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/parse-xml.c b/core/parse-xml.c index c56a96ddb..f3c2e0de8 100644 --- a/core/parse-xml.c +++ b/core/parse-xml.c @@ -401,7 +401,7 @@ static void extra_data_end(void) { // don't save partial structures - we must have both key and value if (cur_extra_data.key && cur_extra_data.value) - add_extra_data(cur_dc, cur_extra_data.key, cur_extra_data.value); + add_extra_data(get_dc(), cur_extra_data.key, cur_extra_data.value); } static void weight(char *buffer, weight_t *weight) |