Fix SIGSEGV if no pre-existing nickname information

Loading an xml file with dive computer information without any
preexisting nickname data would try to "remember" that NULL nickname.
Causing a SIGSEGV if there was no nickname information.

The bug was introduced by commit ec38d3708d ("Move device_info handling
into a new 'device.c' file") when I inadvertently removed a bit too much
code. It actually wants to remember a missing DC nickname as an empty one.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2013-01-11 11:37:32 -08:00 committed by Dirk Hohndel
parent e8a896b64d
commit c44755878c

View file

@ -1737,6 +1737,9 @@ void remember_dc(const char *model, uint32_t deviceid, const char *nickname, gbo
if (!nn_entry)
return;
if (!nickname)
nickname = "";
/* No existing nickname? */
if (!nn_entry->nickname) {
char buffer[160];