1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00

Just use strdup

In commit 272f85bb24 ("Fix silly crash") I indeed fixed the crash, but I
also broke the code. Now a broken userid might end upsaved in the data
file. Oops.

This should be correct now.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-10-11 17:35:31 -04:00
parent 43765d2897
commit 9882bf5ff8

8
dive.c
View file

@ -2505,7 +2505,6 @@ timestamp_t get_times()
return dive->when;
}
#define MAX_USERID_SIZE 32
void set_save_userid_local(short value)
{
prefs.save_userid_local = value;
@ -2513,13 +2512,8 @@ void set_save_userid_local(short value)
void set_userid(char *rUserId)
{
prefs.userid = (char *)malloc(MAX_USERID_SIZE + 1);
if (prefs.userid && rUserId) {
strncpy(prefs.userid, rUserId, MAX_USERID_SIZE);
prefs.userid[MAX_USERID_SIZE] = 0;
}
prefs.userid = strdup(rUserId);
}
#undef MAX_USERID_SIZE
int average_depth(struct diveplan *dive)
{